Merge pull request #12 from steveklabnik/master

Clark Gaebel · Clark Gaebel · commit ef6af67e8ff4 · 2014-10-29T21:25:53.000-07:00
fail -&gt; panic
diff --git a/src/lex.rs b/src/lex.rs
@@ -144,7 +144,7 @@ impl<'a> Iterator<String> for Lexer<'a> {
     self.next_word().map(|buf| {
       match String::from_utf8(buf) {
         Ok(s) => s,
-        Err(_) => fail!("Lex error: Invalid utf8 on line {}.", self.current_line_number),
+        Err(_) => panic!("Lex error: Invalid utf8 on line {}.", self.current_line_number),
       }
     })
   }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ impl<'a> Iterator<String> for Lexer<'a> {`
`144`	`144`	`self.next_word().map(\|buf\| {`
`145`	`145`	`match String::from_utf8(buf) {`
`146`	`146`	`Ok(s) => s,`
`147`		`- Err(_) => fail!("Lex error: Invalid utf8 on line {}.", self.current_line_number),`
	`147`	`+ Err(_) => panic!("Lex error: Invalid utf8 on line {}.", self.current_line_number),`
`148`	`148`	`}`
`149`	`149`	`})`
`150`	`150`	`}`