Skip to content

Upgrade all the deps #15

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
illicitonion merged 3 commits into from
Oct 3, 2019
Merged

Upgrade all the deps #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0f3a2d
Upgrade all the deps
illicitonion Oct 1, 2019
434fda9
Use quote not proc_quote
illicitonion Oct 3, 2019
9f6d475
Use to_string instead of format
illicitonion Oct 3, 2019
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 num_enum_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ default = ["std"] # disable to use in a `no_std` environment
features = ["external_doc"]

[dependencies]
proc-macro2 = "0.4.30"
proc-macro2 = "1"
proc-macro-crate = "0.1.4"
proc-quote = "0.2.2"
syn = "0.15.44"
quote = "1"
syn = "1"
40 changes: 21 additions & 19 deletions num_enum_derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extern crate proc_macro;
use ::proc_macro::TokenStream;
use ::proc_macro2::Span;
use ::proc_quote::quote;
use ::quote::quote;
use ::std::iter::FromIterator;
use ::syn::{
parse::{Parse, ParseStream},
Expand All @@ -24,7 +24,7 @@ macro_rules! die {
}

fn literal(i: u64) -> Expr {
let literal = LitInt::new(i, syn::IntSuffix::None, Span::call_site());
let literal = LitInt::new(&i.to_string(), Span::call_site());
parse_quote! {
#literal
}
Expand Down Expand Up @@ -57,23 +57,25 @@ impl Parse for EnumInfo {
loop {
if let Some(attr) = attrs.next() {
if let Ok(Meta::List(meta_list)) = attr.parse_meta() {
if meta_list.ident == "repr" {
let mut nested = meta_list.nested.iter();
if nested.len() != 1 {
die!(meta_list.ident.span()=>
"Expected exactly one `repr` argument"
);
}
let repr = nested.next().unwrap();
let repr: Ident = parse_quote! {
#repr
};
if repr == "C" {
die!(repr.span()=>
"repr(C) doesn't have a well defined size"
);
} else {
break repr;
if let Some(ident) = meta_list.path.get_ident() {
if ident == "repr" {
let mut nested = meta_list.nested.iter();
if nested.len() != 1 {
die!(ident.span()=>
"Expected exactly one `repr` argument"
);
}
let repr = nested.next().unwrap();
let repr: Ident = parse_quote! {
#repr
};
if repr == "C" {
die!(repr.span()=>
"repr(C) doesn't have a well defined size"
);
} else {
break repr;
}
}
}
}
Expand Down