diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-05-19 23:19:56 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-05-22 14:42:02 -0700 |
| commit | e878721d70349e2055f0ef854085de92e9498fde (patch) | |
| tree | 35940d52f145bca81dcf73e5e7da7f3847ceb413 /src/libsyntax | |
| parent | 5633d4641f7d63805e3c12c899f8401410bd825f (diff) | |
| download | rust-e878721d70349e2055f0ef854085de92e9498fde.tar.gz rust-e878721d70349e2055f0ef854085de92e9498fde.zip | |
libcore: Remove all uses of `~str` from `libcore`.
[breaking-change]
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/asm.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 5 |
4 files changed, 14 insertions, 5 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index f9f5322625f..822084df2f6 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -107,7 +107,9 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) (Some('+'), operand) => { // Save a reference to the output read_write_operands.push((outputs.len(), out)); - Some(token::intern_and_get_ident("=" + operand)) + Some(token::intern_and_get_ident(format!( + "={}", + operand).as_slice())) } _ => { cx.span_err(span, "output operand constraint lacks '=' or '+'"); diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 54308536ab2..ce1c7da585f 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -188,7 +188,9 @@ pub fn nameize(p_s: &ParseSess, ms: &[Matcher], res: &[Rc<NamedMatch>]) if ret_val.contains_key(&bind_name) { let string = token::get_ident(bind_name); p_s.span_diagnostic - .span_fatal(span, "duplicated bind name: " + string.get()) + .span_fatal(span, + format!("duplicated bind name: {}", + string.get()).as_slice()) } ret_val.insert(bind_name, res[idx].clone()); } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 7d0276ae16f..4897fed6928 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4259,12 +4259,14 @@ impl<'a> Parser<'a> { self.span_note(id_sp, format!("maybe move this module `{0}` \ to its own directory via \ - `{0}/mod.rs`", this_module)); + `{0}/mod.rs`", + this_module).as_slice()); if default_exists || secondary_exists { self.span_note(id_sp, format!("... or maybe `use` the module \ `{}` instead of possibly \ - redeclaring it", mod_name)); + redeclaring it", + mod_name).as_slice()); } self.abort_if_errors(); } diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 60cf7a67cbe..5500ca45753 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -2252,7 +2252,10 @@ impl<'a> State<'a> { } ast::LitFloat(ref f, t) => { word(&mut self.s, - f.get() + ast_util::float_ty_to_str(t).as_slice()) + format!( + "{}{}", + f.get(), + ast_util::float_ty_to_str(t).as_slice()).as_slice()) } ast::LitFloatUnsuffixed(ref f) => word(&mut self.s, f.get()), ast::LitNil => word(&mut self.s, "()"), |