rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove usages of Term::as_str and mark it for removal

Browse Source
This commit is contained in:
John Kåre Alsaker
2018-04-09 23:49:25 +02:00
parent 78bcd9b5fe
commit 221b7ca3c2
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libproc_macro/lib.rs
View File

@@ -715,6 +715,7 @@ impl Term {
} }
} }
// FIXME: Remove this, do not stabilize
/// Get a reference to the interned string. /// Get a reference to the interned string.
#[unstable(feature = "proc_macro", issue = "38356")] #[unstable(feature = "proc_macro", issue = "38356")]
pub fn as_str(&self) -> &str { pub fn as_str(&self) -> &str {
@@ -739,7 +740,7 @@ impl Term {
#[unstable(feature = "proc_macro", issue = "38356")] #[unstable(feature = "proc_macro", issue = "38356")]
impl fmt::Display for Term { impl fmt::Display for Term {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.as_str().fmt(f) self.sym.as_str().fmt(f)
} }
} }
@@ -1131,7 +1132,7 @@ impl TokenTree {
}, },
self::TokenTree::Term(tt) => { self::TokenTree::Term(tt) => {
let ident = ast::Ident::new(tt.sym, tt.span.0); let ident = ast::Ident::new(tt.sym, tt.span.0);
let sym_str = tt.sym.as_str(); let sym_str = tt.sym.to_string();
let token = if sym_str.starts_with("'") { let token = if sym_str.starts_with("'") {
Lifetime(ident) Lifetime(ident)
} else if sym_str.starts_with("r#") { } else if sym_str.starts_with("r#") {

2
src/libproc_macro/quote.rs
View File

@@ -183,7 +183,7 @@ impl Quote for Op {
impl Quote for Term { impl Quote for Term {
fn quote(self) -> TokenStream { fn quote(self) -> TokenStream {
quote!(::Term::new((quote self.as_str()), (quote self.span()))) quote!(::Term::new((quote self.sym.as_str()), (quote self.span())))
} }
} }

6
src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs
View File

@@ -86,7 +86,7 @@ fn assert_doc(slice: &mut &[TokenTree]) {
} }
match &tokens[0] { match &tokens[0] {
TokenTree::Term(tt) => assert_eq!("doc", tt.as_str()), TokenTree::Term(tt) => assert_eq!("doc", &*tt.to_string()),
_ => panic!("expected `doc`"), _ => panic!("expected `doc`"),
} }
match &tokens[1] { match &tokens[1] {
@@ -118,11 +118,11 @@ fn assert_invoc(slice: &mut &[TokenTree]) {
fn assert_foo(slice: &mut &[TokenTree]) { fn assert_foo(slice: &mut &[TokenTree]) {
match &slice[0] { match &slice[0] {
TokenTree::Term(tt) => assert_eq!(tt.as_str(), "fn"), TokenTree::Term(tt) => assert_eq!(&*tt.to_string(), "fn"),
_ => panic!("expected fn"), _ => panic!("expected fn"),
} }
match &slice[1] { match &slice[1] {
TokenTree::Term(tt) => assert_eq!(tt.as_str(), "foo"), TokenTree::Term(tt) => assert_eq!(&*tt.to_string(), "foo"),
_ => panic!("expected foo"), _ => panic!("expected foo"),
} }
match &slice[2] { match &slice[2] {

2
src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs
View File

@@ -33,7 +33,7 @@ pub fn cond(input: TokenStream) -> TokenStream {
panic!("Invalid macro usage in cond: {}", cond); panic!("Invalid macro usage in cond: {}", cond);
} }
let is_else = match test { let is_else = match test {
TokenTree::Term(word) => word.as_str() == "else", TokenTree::Term(word) => &*word.to_string() == "else",
_ => false, _ => false,
}; };
conds.push(if is_else || input.peek().is_none() { conds.push(if is_else || input.peek().is_none() {