diff options
| author | bors <bors@rust-lang.org> | 2014-02-12 06:21:44 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-12 06:21:44 -0800 |
| commit | d394a48e731453528b3e77a171cce43084d1f73f (patch) | |
| tree | 3b86d0cbf5c020168ff39146fddf3fa19cf4cd50 | |
| parent | fb12aebbd82eb3a7673738f1ed25f428b3d67242 (diff) | |
| parent | 0465fd7fae9caf87e2e63ee255fbb54e7a269915 (diff) | |
auto merge of #12196 : dguenther/rust/fix-fourcc-example, r=alexcrichton
Cleans up a few issues with `fourcc`: * Corrects the endianness in the docs example * Removes `#[cfg(not(test))]` (bors might not build this on Windows. If the build fails, I'll re-add it) * Adds a FIXME referencing the LLVM assert issue we encountered with bors builds on Windows (Same error as #10872)
| -rw-r--r-- | src/libfourcc/lib.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs index ea82d31bbe7..df693bd1d8b 100644 --- a/src/libfourcc/lib.rs +++ b/src/libfourcc/lib.rs @@ -26,10 +26,10 @@ To load the extension and use it: extern mod fourcc; fn main() { - let val = fourcc!("\xC0\xFF\xEE!") - // val is 0xC0FFEE21 - let big_val = fourcc!("foo ", big); - // big_val is 0x21EEFFC0 + let val = fourcc!("\xC0\xFF\xEE!"); + assert_eq!(val, 0xC0FFEE21u32); + let little_val = fourcc!("foo ", little); + assert_eq!(little_val, 0x21EEFFC0u32); } ``` @@ -60,7 +60,6 @@ use syntax::parse::token; use syntax::parse::token::InternedString; #[macro_registrar] -#[cfg(not(test))] pub fn macro_registrar(register: |Name, SyntaxExtension|) { register(token::intern("fourcc"), NormalTT(~BasicMacroExpander { @@ -155,6 +154,6 @@ fn target_endian_little(cx: &ExtCtxt, sp: Span) -> bool { contains(cx.cfg(), meta) } -// Fixes LLVM assert on Windows +// FIXME (10872): This is required to prevent an LLVM assert on Windows #[test] fn dummy_test() { } |
