summary refs log tree commit diff
path: root/src/libterm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-25 03:30:54 +0000
committerbors <bors@rust-lang.org>2014-08-25 03:30:54 +0000
commit0b3e43d2a47ecf4908a912c1144942e5216703ea (patch)
treebd840737c86c3978d28df854c7e8f90c00e5738d /src/libterm
parent83804f90852f51f043d3011657ba20c1876d2111 (diff)
parent9968ae255495704cb0c3fc1f43d2df2e84c20d5e (diff)
downloadrust-0b3e43d2a47ecf4908a912c1144942e5216703ea.tar.gz
rust-0b3e43d2a47ecf4908a912c1144942e5216703ea.zip
auto merge of #16699 : treeman/rust/issue-8492, r=alexcrichton
Closes #8492.

I did not find this suggestion in the [guidelines][] but it's mentioned in the [old style guide][].

[guidelines]: https://github.com/rust-lang/rust-guidelines
[old style guide]: https://github.com/rust-lang/rust/wiki/Note-style-guide/73c864a10a8e231e2a6630e5a3461f1d3022a20a
Diffstat (limited to 'src/libterm')
-rw-r--r--src/libterm/terminfo/parser/compiled.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index 94ed7fbbf30..2826ecc1a12 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -184,7 +184,7 @@ pub fn parse(file: &mut io::Reader, longnames: bool)
     // Check magic number
     let magic = try!(file.read_le_u16());
     if magic != 0x011A {
-        return Err(format!("invalid magic number: expected {:x} but found {:x}",
+        return Err(format!("invalid magic number: expected {:x}, found {:x}",
                            0x011Au, magic as uint));
     }