nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-06 12:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move modules outside the proc macro

Browse Source
This commit is contained in:
John Kåre Alsaker 2019-04-09 09:36:17 +02:00
parent afeda72dad
commit baebf79057
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/librustc_macros/src/symbols.rs
View File

@ -129,37 +129,27 @@ pub fn symbols(input: TokenStream) -> TokenStream {
} }
TokenStream::from(quote! { TokenStream::from(quote! {
#[allow(non_upper_case_globals)] macro_rules! keywords {
pub mod keywords { () => {
use super::{Symbol, Ident}; #keyword_stream
#[derive(Clone, Copy, PartialEq, Eq)]
pub struct Keyword {
ident: Ident,
}
impl Keyword {
#[inline] pub fn ident(self) -> Ident { self.ident }
#[inline] pub fn name(self) -> Symbol { self.ident.name }
}
#keyword_stream impl std::str::FromStr for Keyword {
type Err = ();
impl std::str::FromStr for Keyword { fn from_str(s: &str) -> Result<Self, ()> {
type Err = (); match s {
#from_str_stream
fn from_str(s: &str) -> Result<Self, ()> { _ => Err(()),
match s { }
#from_str_stream
_ => Err(()),
} }
} }
} }
} }
#[allow(non_upper_case_globals)] macro_rules! symbols {
pub mod symbols { () => {
use super::Symbol; #symbols_stream
}
#symbols_stream
} }
impl Interner { impl Interner {

28
src/libsyntax_pos/symbol.rs
View File

@ -406,6 +406,34 @@ impl Interner {
} }
} }
pub mod keywords {
use super::{Symbol, Ident};
#[derive(Clone, Copy, PartialEq, Eq)]
pub struct Keyword {
ident: Ident,
}
impl Keyword {
#[inline]
pub fn ident(self) -> Ident {
self.ident
}
#[inline]
pub fn name(self) -> Symbol {
self.ident.name
}
}
keywords!();
}
pub mod symbols {
use super::Symbol;
symbols!();
}
impl Symbol { impl Symbol {
fn is_used_keyword_2018(self) -> bool { fn is_used_keyword_2018(self) -> bool {
self == keywords::Dyn.name() self == keywords::Dyn.name()