about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-17 09:10:28 -0700
committerbors <bors@rust-lang.org>2013-05-17 09:10:28 -0700
commitff081980e7b5005d3e06ea539819ad98656d4a9b (patch)
tree93b22ac43b16ff7d635305f83f1339147cf23e03 /src/libstd
parent290a2ebab61282d89b211192679e84d22a01fd14 (diff)
parentaa179cb0f1bfd56da67604b31ce3f72d0baff8b8 (diff)
downloadrust-ff081980e7b5005d3e06ea539819ad98656d4a9b.tar.gz
rust-ff081980e7b5005d3e06ea539819ad98656d4a9b.zip
auto merge of #6561 : huonw/rust/rustc-u-int-limit-lint, r=nikomatsakis
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ebml.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 07c1c226d1f..64f78d5ab7b 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -779,7 +779,7 @@ pub mod writer {
     priv impl Encoder {
         // used internally to emit things like the vector length and so on
         fn _emit_tagged_uint(&mut self, t: EbmlEncoderTag, v: uint) {
-            assert!(v <= 0xFFFF_FFFF_u); // FIXME(#6130) assert warns on 32-bit
+            assert!(v <= 0xFFFF_FFFF_u);
             self.wr_tagged_u32(t as uint, v as u32);
         }