summary refs log tree commit diff
path: root/src/libsyntax/ext/tt/macro_parser.rs
diff options
context:
space:
mode:
authorRicho Healey <richo@psych0tik.net>2014-06-21 03:39:03 -0700
committerBrian Anderson <banderson@mozilla.com>2014-07-08 13:01:43 -0700
commit12c334a77b897f7b1cb6cff3c56a71ecb89c82af (patch)
tree1f5a85061a69058875391ec6171cf8b446996dff /src/libsyntax/ext/tt/macro_parser.rs
parentbfe4ddfdea45533c98657701509bb7185fd96cba (diff)
downloadrust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.tar.gz
rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.zip
std: Rename the `ToStr` trait to `ToString`, and `to_str` to `to_string`.
[breaking-change]
Diffstat (limited to 'src/libsyntax/ext/tt/macro_parser.rs')
-rw-r--r--src/libsyntax/ext/tt/macro_parser.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs
index 86fbc8cec2a..913e0427bda 100644
--- a/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@ -395,7 +395,7 @@ pub fn parse(sess: &ParseSess,
                     nts, next_eis.len()).to_string());
             } else if bb_eis.len() == 0u && next_eis.len() == 0u {
                 return Failure(sp, format!("no rules expected the token `{}`",
-                            token::to_str(&tok)).to_string());
+                            token::to_string(&tok)).to_string());
             } else if next_eis.len() > 0u {
                 /* Now process the next token */
                 while next_eis.len() > 0u {
@@ -442,7 +442,7 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal {
       "ident" => match p.token {
         token::IDENT(sn,b) => { p.bump(); token::NtIdent(box sn,b) }
         _ => {
-            let token_str = token::to_str(&p.token);
+            let token_str = token::to_string(&p.token);
             p.fatal((format!("expected ident, found {}",
                              token_str.as_slice())).as_slice())
         }