chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade proc-macro-crate to 1.0.0

Browse Source
This commit is contained in:
Jonas Platte 2021-03-23 20:43:58 +01:00
parent a891d1c615
commit c27b17e5f9
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruma-api-macros/Cargo.toml
View File

@ -18,7 +18,7 @@ edition = "2018"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
quote = "1.0.8" quote = "1.0.8"
syn = { version = "1.0.57", features = ["full", "extra-traits"] } syn = { version = "1.0.57", features = ["full", "extra-traits"] }
proc-macro-crate = "0.1.5" proc-macro-crate = "1.0.0"
[lib] [lib]
proc-macro = true proc-macro = true

6
ruma-api-macros/src/util.rs
View File

@ -3,7 +3,7 @@
use std::collections::BTreeSet; use std::collections::BTreeSet;
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use proc_macro_crate::crate_name; use proc_macro_crate::{crate_name, FoundCrate};
use quote::quote; use quote::quote;
use syn::{ use syn::{
AngleBracketedGenericArguments, AttrStyle, Attribute, GenericArgument, Ident, Lifetime, AngleBracketedGenericArguments, AttrStyle, Attribute, GenericArgument, Ident, Lifetime,
@ -393,10 +393,10 @@ pub(crate) fn is_valid_endpoint_path(string: &str) -> bool {
} }
pub fn import_ruma_api() -> TokenStream { pub fn import_ruma_api() -> TokenStream {
if let Ok(possibly_renamed) = crate_name("ruma-api") { if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-api") {
let import = Ident::new(&possibly_renamed, Span::call_site()); let import = Ident::new(&possibly_renamed, Span::call_site());
quote! { ::#import } quote! { ::#import }
} else if let Ok(possibly_renamed) = crate_name("ruma") { } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
let import = Ident::new(&possibly_renamed, Span::call_site()); let import = Ident::new(&possibly_renamed, Span::call_site());
quote! { ::#import::api } quote! { ::#import::api }
} else { } else {

2
ruma-events-macros/Cargo.toml
View File

@ -19,7 +19,7 @@ version = "0.22.0-alpha.2"
syn = { version = "1.0.57", features = ["full"] } syn = { version = "1.0.57", features = ["full"] }
quote = "1.0.8" quote = "1.0.8"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
proc-macro-crate = "0.1.5" proc-macro-crate = "1.0.0"
[lib] [lib]
proc-macro = true proc-macro = true

6
ruma-events-macros/src/lib.rs
View File

@ -9,7 +9,7 @@
use proc_macro::TokenStream; use proc_macro::TokenStream;
use proc_macro2 as pm2; use proc_macro2 as pm2;
use proc_macro_crate::crate_name; use proc_macro_crate::{crate_name, FoundCrate};
use quote::quote; use quote::quote;
use syn::{parse_macro_input, DeriveInput, Ident}; use syn::{parse_macro_input, DeriveInput, Ident};
@ -125,10 +125,10 @@ pub fn derive_state_event(input: TokenStream) -> TokenStream {
} }
pub(crate) fn import_ruma_events() -> pm2::TokenStream { pub(crate) fn import_ruma_events() -> pm2::TokenStream {
if let Ok(possibly_renamed) = crate_name("ruma-events") { if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-events") {
let import = Ident::new(&possibly_renamed, pm2::Span::call_site()); let import = Ident::new(&possibly_renamed, pm2::Span::call_site());
quote! { ::#import } quote! { ::#import }
} else if let Ok(possibly_renamed) = crate_name("ruma") { } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
let import = Ident::new(&possibly_renamed, pm2::Span::call_site()); let import = Ident::new(&possibly_renamed, pm2::Span::call_site());
quote! { ::#import::events } quote! { ::#import::events }
} else { } else {

2
ruma-serde-macros/Cargo.toml
View File

@ -14,7 +14,7 @@ edition = "2018"
proc-macro = true proc-macro = true
[dependencies] [dependencies]
proc-macro-crate = "0.1.5" proc-macro-crate = "1.0.0"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
quote = "1.0.8" quote = "1.0.8"
syn = { version = "1.0.55", features = ["full", "extra-traits"] } syn = { version = "1.0.55", features = ["full", "extra-traits"] }

6
ruma-serde-macros/src/util.rs
View File

@ -1,5 +1,5 @@
use proc_macro2::{Ident, Span, TokenStream}; use proc_macro2::{Ident, Span, TokenStream};
use proc_macro_crate::crate_name; use proc_macro_crate::{crate_name, FoundCrate};
use quote::quote; use quote::quote;
use syn::{ItemEnum, LitStr, Variant}; use syn::{ItemEnum, LitStr, Variant};
@ -9,10 +9,10 @@ use crate::{
}; };
pub fn import_ruma_serde() -> TokenStream { pub fn import_ruma_serde() -> TokenStream {
if let Ok(possibly_renamed) = crate_name("ruma-serde") { if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma-serde") {
let import = Ident::new(&possibly_renamed, Span::call_site()); let import = Ident::new(&possibly_renamed, Span::call_site());
quote! { ::#import } quote! { ::#import }
} else if let Ok(possibly_renamed) = crate_name("ruma") { } else if let Ok(FoundCrate::Name(possibly_renamed)) = crate_name("ruma") {
let import = Ident::new(&possibly_renamed, Span::call_site()); let import = Ident::new(&possibly_renamed, Span::call_site());
quote! { ::#import::serde } quote! { ::#import::serde }
} else { } else {