diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-06-14 19:40:11 -0700 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-06-28 10:44:16 -0400 |
| commit | 89eb9951958dc2cd652645cea5badf4bb9edc6f9 (patch) | |
| tree | dc234db5e74b23cec4080026d8c316d88849e638 /src/libsyntax | |
| parent | 03ab6351ccc7b0e2b6102f88eddc0bbe84f2abc0 (diff) | |
| download | rust-89eb9951958dc2cd652645cea5badf4bb9edc6f9.tar.gz rust-89eb9951958dc2cd652645cea5badf4bb9edc6f9.zip | |
librustc: Fix merge fallout.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/pipes/pipec.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/pipes/pipec.rs b/src/libsyntax/ext/pipes/pipec.rs index 8e1276d52d1..3044cd50b34 100644 --- a/src/libsyntax/ext/pipes/pipec.rs +++ b/src/libsyntax/ext/pipes/pipec.rs @@ -98,7 +98,7 @@ impl gen_send for message { } body.push_str(fmt!("let message = %s(%s);\n", name, - vec::append_one(arg_names.map(|x| cx.str_of(*x)), ~"s") + vec::append_one(arg_names.map(|x| cx.str_of(*x)), @"s") .connect(", "))); if !try { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 64bdfd4a4d3..f1b5c4d16be 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -378,7 +378,7 @@ impl Parser { self.fatal( fmt!( "expected `%s`, found `%s`", - *self.id_to_str(kw.to_ident()), + self.id_to_str(kw.to_ident()).to_str(), self.this_token_to_str() ) ); |