Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade librustc_macros dependencies #65101

Merged
merged 1 commit into from Oct 7, 2019
Merged

Upgrade librustc_macros dependencies #65101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 18 additions & 6 deletions Cargo.lock
View file
Open in desktop
Expand Up @@ -993,7 +993,7 @@ dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"synstructure",
"synstructure 0.10.2",
]

[[package]]
Expand Down Expand Up @@ -3165,7 +3165,7 @@ dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.12",
"syn 0.15.35",
"synstructure",
"synstructure 0.10.2",
]

[[package]]
Expand Down Expand Up @@ -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]]
Expand Down Expand Up @@ -4242,6 +4242,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"
Expand Down
8 changes: 4 additions & 4 deletions src/librustc_macros/Cargo.toml
View file
Open in desktop
Expand Up @@ -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 changes: 4 additions & 4 deletions src/librustc_macros/src/hash_stable.rs
View file
Open in desktop
Expand Up @@ -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;
}
}
Expand Down