Skip to content

Update dependencies #1

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

Merged
frozenlib merged 1 commit into from
Aug 25, 2019
Merged

Update dependencies #1

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions parse-display-derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ edition = "2018"
proc-macro = true

[dependencies]
syn = "0.15"
quote = "0.6"
proc-macro2 = "0.4"
syn = "1.0"
quote = "1.0"
proc-macro2 = "1.0"
regex = "1"
regex-syntax = "0.6"
lazy_static = "1.3"
28 changes: 14 additions & 14 deletions parse-display-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,23 +561,23 @@ impl HelperAttributes {
for a in attrs {
let m = a.parse_meta().unwrap();
match &m {
Meta::List(ml) if ml.ident == "display" => {
Meta::List(ml) if ml.path.get_ident().map(|ident| ident == "display").unwrap_or(false) => {
for m in ml.nested.iter() {
has.set_display_nested_meta(m);
}
}
Meta::NameValue(nv) if nv.ident == "display" => {
Meta::NameValue(nv) if nv.path.get_ident().map(|ident| ident == "display").unwrap_or(false) => {
panic!(
"`#[display = ..]` is not allowed. \n{}",
DISPLAY_HELPER_USAGE
);
}
Meta::List(ml) if ml.ident == "from_str" => {
Meta::List(ml) if ml.path.get_ident().map(|ident| ident == "from_str").unwrap_or(false) => {
for m in ml.nested.iter() {
has.set_from_str_nested_meta(m);
}
}
Meta::NameValue(nv) if nv.ident == "from_str" => {
Meta::NameValue(nv) if nv.path.get_ident().map(|ident| ident == "from_str").unwrap_or(false) => {
panic!(
"`#[from_str = ..]` is not allowed. \n{}",
FROM_STR_HELPER_USAGE
Expand All @@ -590,17 +590,17 @@ impl HelperAttributes {
}
fn set_display_nested_meta(&mut self, m: &NestedMeta) {
match m {
NestedMeta::Literal(Lit::Str(s)) => {
NestedMeta::Lit(Lit::Str(s)) => {
if self.format.is_some() {
panic!("display format can be specified only once.")
}
self.format = Some(DisplayFormat::from(&s.value()));
}
NestedMeta::Meta(Meta::NameValue(MetaNameValue {
ident,
path,
lit: Lit::Str(s),
..
})) if ident == "style" => {
})) if path.get_ident().map(|ident| ident == "style").unwrap_or(false) => {
if self.style.is_some() {
panic!("display style can be specified only once.");
}
Expand All @@ -618,26 +618,26 @@ impl HelperAttributes {
fn set_from_str_nested_meta(&mut self, m: &NestedMeta) {
match m {
NestedMeta::Meta(Meta::NameValue(MetaNameValue {
ident,
path,
lit: Lit::Str(s),
..
})) if ident == "regex" => {
})) if path.get_ident().map(|ident| ident == "regex").unwrap_or(false) => {
if self.regex.is_some() {
panic!("from_str regex can be specified only once.");
}
self.regex = Some(s.value());
}
NestedMeta::Meta(Meta::Word(ident)) if ident == "default" => {
NestedMeta::Meta(Meta::Path(path)) if path.get_ident().map(|ident| ident == "default").unwrap_or(false) => {
self.default_self = true;
}
NestedMeta::Meta(Meta::List(l)) if l.ident == "default_fields" => {
NestedMeta::Meta(Meta::List(l)) if l.path.get_ident().map(|ident| ident == "default_fields").unwrap_or(false) => {
for m in l.nested.iter() {
match m {
NestedMeta::Literal(Lit::Str(s)) => {
NestedMeta::Lit(Lit::Str(s)) => {
self.default_fields.push(s.value());
}
NestedMeta::Meta(Meta::Word(ident)) => {
self.default_fields.push(ident.to_string());
NestedMeta::Meta(Meta::Path(path)) => {
path.get_ident().map(|ident| self.default_fields.push(ident.to_string()));
}
_ => {
panic!(
Expand Down