From 5633d4641f7d63805e3c12c899f8401410bd825f Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 19 May 2014 17:23:26 -0700 Subject: libstd: Remove all uses of `~str` from `libstd` --- src/libsyntax/crateid.rs | 8 +++++--- src/libsyntax/diagnostic.rs | 9 +++++---- src/libsyntax/ext/asm.rs | 2 +- src/libsyntax/ext/concat.rs | 2 +- src/libsyntax/ext/concat_idents.rs | 2 +- src/libsyntax/ext/quote.rs | 6 +++--- src/libsyntax/ext/source_util.rs | 4 +++- src/libsyntax/ext/tt/macro_parser.rs | 5 ++++- src/libsyntax/parse/lexer.rs | 7 +++---- src/libsyntax/parse/parser.rs | 6 +++--- src/libsyntax/print/pprust.rs | 5 +++-- 11 files changed, 32 insertions(+), 24 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/crateid.rs b/src/libsyntax/crateid.rs index c2b5804ecee..dc699bb9850 100644 --- a/src/libsyntax/crateid.rs +++ b/src/libsyntax/crateid.rs @@ -54,12 +54,14 @@ impl FromStr for CrateId { let pieces: Vec<&str> = s.splitn('#', 1).collect(); let path = pieces.get(0).to_owned(); - if path.starts_with("/") || path.ends_with("/") || - path.starts_with(".") || path.is_empty() { + if path.as_slice().starts_with("/") || path.as_slice().ends_with("/") || + path.as_slice().starts_with(".") || path.is_empty() { return None; } - let path_pieces: Vec<&str> = path.rsplitn('/', 1).collect(); + let path_pieces: Vec<&str> = path.as_slice() + .rsplitn('/', 1) + .collect(); let inferred_name = *path_pieces.get(0); let (name, version) = if pieces.len() == 1 { diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index aa8f397f747..446a8f93753 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -106,7 +106,7 @@ impl SpanHandler { fail!(ExplicitBug); } pub fn span_unimpl(&self, sp: Span, msg: &str) -> ! { - self.span_bug(sp, "unimplemented ".to_owned() + msg); + self.span_bug(sp, format!("unimplemented {}", msg).as_slice()); } pub fn handler<'a>(&'a self) -> &'a Handler { &self.handler @@ -162,7 +162,7 @@ impl Handler { fail!(ExplicitBug); } pub fn unimpl(&self, msg: &str) -> ! { - self.bug("unimplemented ".to_owned() + msg); + self.bug(format!("unimplemented {}", msg).as_slice()); } pub fn emit(&self, cmsp: Option<(&codemap::CodeMap, Span)>, @@ -434,7 +434,8 @@ fn highlight_lines(err: &mut EmitterWriter, s.push_char('~'); } } - try!(print_maybe_styled(err, s.into_owned() + "\n", + try!(print_maybe_styled(err, + format!("{}\n", s).as_slice(), term::attr::ForegroundColor(lvl.color()))); } Ok(()) @@ -479,7 +480,7 @@ fn custom_highlight_lines(w: &mut EmitterWriter, s.push_char('^'); s.push_char('\n'); print_maybe_styled(w, - s.into_owned(), + s.as_slice(), term::attr::ForegroundColor(lvl.color())) } diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 2fa1c13f5d7..f9f5322625f 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -217,7 +217,7 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) node: ast::ExprInlineAsm(ast::InlineAsm { asm: token::intern_and_get_ident(asm.get()), asm_str_style: asm_str_style.unwrap(), - clobbers: token::intern_and_get_ident(cons), + clobbers: token::intern_and_get_ident(cons.as_slice()), inputs: inputs, outputs: outputs, volatile: volatile, diff --git a/src/libsyntax/ext/concat.rs b/src/libsyntax/ext/concat.rs index 314d63c2d3b..b2baff8d286 100644 --- a/src/libsyntax/ext/concat.rs +++ b/src/libsyntax/ext/concat.rs @@ -59,5 +59,5 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt, } base::MacExpr::new(cx.expr_str( sp, - token::intern_and_get_ident(accumulator.into_owned()))) + token::intern_and_get_ident(accumulator.as_slice()))) } diff --git a/src/libsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs index 0e168e7b33b..24478358d79 100644 --- a/src/libsyntax/ext/concat_idents.rs +++ b/src/libsyntax/ext/concat_idents.rs @@ -42,7 +42,7 @@ pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) } } } - let res = str_to_ident(res_str.into_owned()); + let res = str_to_ident(res_str.as_slice()); let e = @ast::Expr { id: ast::DUMMY_NODE_ID, diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index b3eec136c7d..bb3a88f44e4 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -436,7 +436,7 @@ fn mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> @ast::Expr { ast::TyI32 => "TyI32".to_owned(), ast::TyI64 => "TyI64".to_owned() }; - let e_ity = cx.expr_ident(sp, id_ext(s_ity)); + let e_ity = cx.expr_ident(sp, id_ext(s_ity.as_slice())); let e_i64 = cx.expr_lit(sp, ast::LitInt(i, ast::TyI64)); @@ -453,7 +453,7 @@ fn mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> @ast::Expr { ast::TyU32 => "TyU32".to_owned(), ast::TyU64 => "TyU64".to_owned() }; - let e_uty = cx.expr_ident(sp, id_ext(s_uty)); + let e_uty = cx.expr_ident(sp, id_ext(s_uty.as_slice())); let e_u64 = cx.expr_lit(sp, ast::LitUint(u, ast::TyU64)); @@ -476,7 +476,7 @@ fn mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> @ast::Expr { ast::TyF64 => "TyF64".to_owned(), ast::TyF128 => "TyF128".to_owned() }; - let e_fty = cx.expr_ident(sp, id_ext(s_fty)); + let e_fty = cx.expr_ident(sp, id_ext(s_fty.as_slice())); let e_fident = mk_ident(cx, sp, fident); diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 52f262b052b..452719d2dd8 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -76,7 +76,9 @@ pub fn expand_mod(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) .map(|x| token::get_ident(*x).get().to_strbuf()) .collect::>() .connect("::"); - base::MacExpr::new(cx.expr_str(sp, token::intern_and_get_ident(string))) + base::MacExpr::new(cx.expr_str( + sp, + token::intern_and_get_ident(string.as_slice()))) } // include! : parse the given file as an expr diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 89e8d48425f..54308536ab2 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -455,6 +455,9 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal { res } "matchers" => token::NtMatchers(p.parse_matchers()), - _ => p.fatal("unsupported builtin nonterminal parser: ".to_owned() + name) + _ => { + p.fatal(format!("unsupported builtin nonterminal parser: {}", + name).as_slice()) + } } } diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index c78d2aaf3a7..5a7a816dbb3 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -589,13 +589,13 @@ fn scan_number(c: char, rdr: &mut StringReader) -> token::Token { bump(rdr); bump(rdr); check_float_base(rdr, start_bpos, rdr.last_pos, base); - return token::LIT_FLOAT(str_to_ident(num_str.into_owned()), + return token::LIT_FLOAT(str_to_ident(num_str.as_slice()), ast::TyF32); } else if c == '6' && n == '4' { bump(rdr); bump(rdr); check_float_base(rdr, start_bpos, rdr.last_pos, base); - return token::LIT_FLOAT(str_to_ident(num_str.into_owned()), + return token::LIT_FLOAT(str_to_ident(num_str.as_slice()), ast::TyF64); /* FIXME (#2252): if this is out of range for either a 32-bit or 64-bit float, it won't be noticed till the @@ -612,8 +612,7 @@ fn scan_number(c: char, rdr: &mut StringReader) -> token::Token { } if is_float { check_float_base(rdr, start_bpos, rdr.last_pos, base); - return token::LIT_FLOAT_UNSUFFIXED(str_to_ident( - num_str.into_owned())); + return token::LIT_FLOAT_UNSUFFIXED(str_to_ident(num_str.as_slice())); } else { if num_str.len() == 0u { fatal_span(rdr, start_bpos, rdr.last_pos, diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 6bddb45201c..7d0276ae16f 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4242,8 +4242,8 @@ impl<'a> Parser<'a> { Some(d) => (dir_path.join(d), true), None => { let mod_name = mod_string.get().to_owned(); - let default_path_str = mod_name + ".rs"; - let secondary_path_str = mod_name + "/mod.rs"; + let default_path_str = format!("{}.rs", mod_name); + let secondary_path_str = format!("{}/mod.rs", mod_name); let default_path = dir_path.join(default_path_str.as_slice()); let secondary_path = dir_path.join(secondary_path_str.as_slice()); let default_exists = default_path.exists(); @@ -4310,7 +4310,7 @@ impl<'a> Parser<'a> { err.push_str(" -> "); } err.push_str(path.display().as_maybe_owned().as_slice()); - self.span_fatal(id_sp, err.into_owned()); + self.span_fatal(id_sp, err.as_slice()); } None => () } diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 785ab6be0dd..60cf7a67cbe 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -141,7 +141,8 @@ pub fn to_str(f: |&mut State| -> IoResult<()>) -> StrBuf { // that we "know" to be a `MemWriter` that works around the lack of checked // downcasts. let (_, wr): (uint, Box) = mem::transmute_copy(&s.s.out); - let result = str::from_utf8_owned(wr.get_ref().to_owned()).unwrap(); + let result = + str::from_utf8_owned(Vec::from_slice(wr.get_ref())).unwrap(); mem::forget(wr); result.to_strbuf() } @@ -2234,7 +2235,7 @@ impl<'a> State<'a> { let mut res = StrBuf::from_str("'"); ch.escape_default(|c| res.push_char(c)); res.push_char('\''); - word(&mut self.s, res.into_owned()) + word(&mut self.s, res.as_slice()) } ast::LitInt(i, t) => { word(&mut self.s, -- cgit 1.4.1-3-g733a5