summary refs log tree commit diff
path: root/src/libsyntax/ext/format.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/format.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/format.rs')
-rw-r--r--src/libsyntax/ext/format.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs
index f39e50ad131..f486d2de339 100644
--- a/src/libsyntax/ext/format.rs
+++ b/src/libsyntax/ext/format.rs
@@ -126,7 +126,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, allow_method: bool,
                 _ => {
                     ecx.span_err(p.span,
                                  format!("expected ident for named argument, but found `{}`",
-                                         p.this_token_to_str()).as_slice());
+                                         p.this_token_to_string()).as_slice());
                     return (invocation, None);
                 }
             };
@@ -690,7 +690,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, sp: Span,
         fmtsp: sp,
     };
     cx.fmtsp = efmt.span;
-    let fmt = match expr_to_str(cx.ecx,
+    let fmt = match expr_to_string(cx.ecx,
                                 efmt,
                                 "format argument must be a string literal.") {
         Some((fmt, _)) => fmt,