diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-01-15 16:26:20 -0800 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2014-02-02 01:44:48 +1100 |
| commit | e68108b3e8b8eaef62bb7b7340a77b96fcfc51cd (patch) | |
| tree | 1c39cd392414e5db5505c05ce8f3abbd170f068a /src/libsyntax/ext/quote.rs | |
| parent | f152be7a425e7d66f717ffe8b210bcacf82539cc (diff) | |
| download | rust-e68108b3e8b8eaef62bb7b7340a77b96fcfc51cd.tar.gz rust-e68108b3e8b8eaef62bb7b7340a77b96fcfc51cd.zip | |
librustc: Stop using `@str` for source.
Diffstat (limited to 'src/libsyntax/ext/quote.rs')
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 71879fc2f1e..11f61c340fc 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -203,7 +203,7 @@ pub mod rt { ($t:ty) => ( impl ToTokens for $t { fn to_tokens(&self, cx: &ExtCtxt) -> ~[TokenTree] { - cx.parse_tts(self.to_source().to_managed()) + cx.parse_tts(self.to_source()) } } ) @@ -213,7 +213,7 @@ pub mod rt { ($t:ty) => ( impl<'a> ToTokens for $t { fn to_tokens(&self, cx: &ExtCtxt) -> ~[TokenTree] { - cx.parse_tts(self.to_source().to_managed()) + cx.parse_tts(self.to_source()) } } ) @@ -240,15 +240,15 @@ pub mod rt { impl_to_tokens!(u64) pub trait ExtParseUtils { - fn parse_item(&self, s: @str) -> @ast::Item; - fn parse_expr(&self, s: @str) -> @ast::Expr; - fn parse_stmt(&self, s: @str) -> @ast::Stmt; - fn parse_tts(&self, s: @str) -> ~[ast::TokenTree]; + fn parse_item(&self, s: ~str) -> @ast::Item; + fn parse_expr(&self, s: ~str) -> @ast::Expr; + fn parse_stmt(&self, s: ~str) -> @ast::Stmt; + fn parse_tts(&self, s: ~str) -> ~[ast::TokenTree]; } impl<'a> ExtParseUtils for ExtCtxt<'a> { - fn parse_item(&self, s: @str) -> @ast::Item { + fn parse_item(&self, s: ~str) -> @ast::Item { let res = parse::parse_item_from_source_str( @"<quote expansion>", s, @@ -257,13 +257,13 @@ pub mod rt { match res { Some(ast) => ast, None => { - error!("Parse error with ```\n{}\n```", s); + error!("Parse error"); fail!() } } } - fn parse_stmt(&self, s: @str) -> @ast::Stmt { + fn parse_stmt(&self, s: ~str) -> @ast::Stmt { parse::parse_stmt_from_source_str( @"<quote expansion>", s, @@ -272,7 +272,7 @@ pub mod rt { self.parse_sess()) } - fn parse_expr(&self, s: @str) -> @ast::Expr { + fn parse_expr(&self, s: ~str) -> @ast::Expr { parse::parse_expr_from_source_str( @"<quote expansion>", s, @@ -280,7 +280,7 @@ pub mod rt { self.parse_sess()) } - fn parse_tts(&self, s: @str) -> ~[ast::TokenTree] { + fn parse_tts(&self, s: ~str) -> ~[ast::TokenTree] { parse::parse_tts_from_source_str( @"<quote expansion>", s, |
