rollup merge of #22497: nikomatsakis/suffixes

Conflicts:
	src/librustc_trans/trans/tvec.rs

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index a5571076aab..c147e6aa056 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -185,7 +185,7 @@ pub fn parse(file: &mut old_io::Reader, longnames: bool)
     let magic = try!(file.read_le_u16());
     if magic != 0x011A {
         return Err(format!("invalid magic number: expected {:x}, found {:x}",
-                           0x011Au, magic as uint));
+                           0x011A as usize, magic as usize));
     }
 
     let names_bytes          = try!(file.read_le_i16()) as int;