Rename TokenStream::empty to TokenStream::new
There is no precedent for the `empty` name -- we do not have `Vec::empty` or `HashMap::empty` etc.
This commit is contained in:
parent
07c415c215
commit
a49bc9ce59
|
@ -93,7 +93,7 @@ impl !Sync for LexError {}
|
|||
impl TokenStream {
|
||||
/// Returns an empty `TokenStream` containing no token trees.
|
||||
#[unstable(feature = "proc_macro", issue = "38356")]
|
||||
pub fn empty() -> TokenStream {
|
||||
pub fn new() -> TokenStream {
|
||||
TokenStream(tokenstream::TokenStream::empty())
|
||||
}
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ macro_rules! quote_tree {
|
|||
}
|
||||
|
||||
macro_rules! quote {
|
||||
() => { TokenStream::empty() };
|
||||
() => { TokenStream::new() };
|
||||
($($t:tt)*) => {
|
||||
[$(quote_tree!($t),)*].iter()
|
||||
.cloned()
|
||||
|
@ -104,7 +104,7 @@ impl<T: Quote> Quote for Option<T> {
|
|||
impl Quote for TokenStream {
|
||||
fn quote(self) -> TokenStream {
|
||||
if self.is_empty() {
|
||||
return quote!(::TokenStream::empty());
|
||||
return quote!(::TokenStream::new());
|
||||
}
|
||||
let mut after_dollar = false;
|
||||
let tokens = self.into_iter().filter_map(|tree| {
|
||||
|
|
|
@ -26,7 +26,7 @@ pub fn assert1(_a: TokenStream, b: TokenStream) -> TokenStream {
|
|||
#[proc_macro_derive(Foo, attributes(foo))]
|
||||
pub fn assert2(a: TokenStream) -> TokenStream {
|
||||
assert_eq(a, "pub struct MyStructc { _a: i32, }".parse().unwrap());
|
||||
TokenStream::empty()
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
fn assert_eq(a: TokenStream, b: TokenStream) {
|
||||
|
|
|
@ -20,13 +20,13 @@ use proc_macro::*;
|
|||
#[proc_macro]
|
||||
pub fn tokens(input: TokenStream) -> TokenStream {
|
||||
assert_nothing_joint(input);
|
||||
TokenStream::empty()
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
#[proc_macro_attribute]
|
||||
pub fn nothing(_: TokenStream, input: TokenStream) -> TokenStream {
|
||||
assert_nothing_joint(input);
|
||||
TokenStream::empty()
|
||||
TokenStream::new()
|
||||
}
|
||||
|
||||
fn assert_nothing_joint(s: TokenStream) {
|
||||
|
|
|
@ -50,7 +50,7 @@ fn parse(input: TokenStream) -> Result<(), Diagnostic> {
|
|||
pub fn three_equals(input: TokenStream) -> TokenStream {
|
||||
if let Err(diag) = parse(input) {
|
||||
diag.emit();
|
||||
return TokenStream::empty();
|
||||
return TokenStream::new();
|
||||
}
|
||||
|
||||
"3".parse().unwrap()
|
||||
|
|
Loading…
Reference in a new issue