squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #65101 - mati865:rustc_macro-deps, r=nikomatsakis

Browse source 
Upgrade librustc_macros dependencies

Passed tests on Linux.
This commit is contained in:
Tyler Mandry 2019-10-06 11:41:56 -07:00 committed by GitHub
commit c457b6fcbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock
View file

@ -993,7 +993,7 @@ dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"synstructure",
"synstructure 0.10.2",
]
[[package]]
@ -3165,7 +3165,7 @@ dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"synstructure",
"synstructure 0.10.2",
]
[[package]]
@ -3546,10 +3546,10 @@ name = "rustc_macros"
version = "0.1.0"
dependencies = [
"itertools 0.8.0",
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"synstructure",
"proc-macro2 1.0.3",
"quote 1.0.2",
"syn 1.0.5",
"synstructure 0.12.1",
]
[[package]]
@ -4244,6 +4244,18 @@ dependencies = [
"unicode-xid 0.1.0",
]
[[package]]
name = "synstructure"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
dependencies = [
"proc-macro2 1.0.3",
"quote 1.0.2",
"syn 1.0.5",
"unicode-xid 0.2.0",
]
[[package]]
name = "syntax"
version = "0.0.0"

8
src/librustc_macros/Cargo.toml
View file

@ -8,8 +8,8 @@ edition = "2018"
proc-macro = true
[dependencies]
synstructure = "0.10.2"
syn = { version = "0.15.22", features = ["full"] }
proc-macro2 = "0.4.24"
quote = "0.6.10"
synstructure = "0.12.1"
syn = { version = "1", features = ["full"] }
proc-macro2 = "1"
quote = "1"
itertools = "0.8"

8
src/librustc_macros/src/hash_stable.rs
View file

@ -15,22 +15,22 @@ fn parse_attributes(field: &syn::Field) -> Attributes {
};
for attr in &field.attrs {
if let Ok(meta) = attr.parse_meta() {
if &meta.name().to_string() != "stable_hasher" {
if !meta.path().is_ident("stable_hasher") {
continue;
}
let mut any_attr = false;
if let Meta::List(list) = meta {
for nested in list.nested.iter() {
if let NestedMeta::Meta(meta) = nested {
if &meta.name().to_string() == "ignore" {
if meta.path().is_ident("ignore") {
attrs.ignore = true;
any_attr = true;
}
if &meta.name().to_string() == "project" {
if meta.path().is_ident("project") {
if let Meta::List(list) = meta {
if let Some(nested) = list.nested.iter().next() {
if let NestedMeta::Meta(meta) = nested {
attrs.project = Some(meta.name());
attrs.project = meta.path().get_ident().cloned();
any_attr = true;
}
}