diff --git a/ruma-api-macros/Cargo.toml b/ruma-api-macros/Cargo.toml index f97a00ed..f4d21feb 100644 --- a/ruma-api-macros/Cargo.toml +++ b/ruma-api-macros/Cargo.toml @@ -18,7 +18,7 @@ edition = "2018" proc-macro2 = "1.0.24" quote = "1.0.8" syn = { version = "1.0.57", features = ["full", "extra-traits"] } -proc-macro-crate = "0.1.5" +proc-macro-crate = "1.0.0" [lib] proc-macro = true diff --git a/ruma-api-macros/src/util.rs b/ruma-api-macros/src/util.rs index fa5312c8..050b2c1d 100644 --- a/ruma-api-macros/src/util.rs +++ b/ruma-api-macros/src/util.rs @@ -3,7 +3,7 @@ use std::collections::BTreeSet; use proc_macro2::{Span, TokenStream}; -use proc_macro_crate::crate_name; +use proc_macro_crate::{crate_name, FoundCrate}; use quote::quote; use syn::{ 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 { - 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()); 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()); quote! { ::#import::api } } else { diff --git a/ruma-events-macros/Cargo.toml b/ruma-events-macros/Cargo.toml index ee7994de..e860cca2 100644 --- a/ruma-events-macros/Cargo.toml +++ b/ruma-events-macros/Cargo.toml @@ -19,7 +19,7 @@ version = "0.22.0-alpha.2" syn = { version = "1.0.57", features = ["full"] } quote = "1.0.8" proc-macro2 = "1.0.24" -proc-macro-crate = "0.1.5" +proc-macro-crate = "1.0.0" [lib] proc-macro = true diff --git a/ruma-events-macros/src/lib.rs b/ruma-events-macros/src/lib.rs index ed04ce01..19a01486 100644 --- a/ruma-events-macros/src/lib.rs +++ b/ruma-events-macros/src/lib.rs @@ -9,7 +9,7 @@ use proc_macro::TokenStream; use proc_macro2 as pm2; -use proc_macro_crate::crate_name; +use proc_macro_crate::{crate_name, FoundCrate}; use quote::quote; 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 { - 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()); 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()); quote! { ::#import::events } } else { diff --git a/ruma-serde-macros/Cargo.toml b/ruma-serde-macros/Cargo.toml index 7e9773cb..6a93f385 100644 --- a/ruma-serde-macros/Cargo.toml +++ b/ruma-serde-macros/Cargo.toml @@ -14,7 +14,7 @@ edition = "2018" proc-macro = true [dependencies] -proc-macro-crate = "0.1.5" +proc-macro-crate = "1.0.0" proc-macro2 = "1.0.24" quote = "1.0.8" syn = { version = "1.0.55", features = ["full", "extra-traits"] } diff --git a/ruma-serde-macros/src/util.rs b/ruma-serde-macros/src/util.rs index 3b3a6c1c..8f6067d5 100644 --- a/ruma-serde-macros/src/util.rs +++ b/ruma-serde-macros/src/util.rs @@ -1,5 +1,5 @@ use proc_macro2::{Ident, Span, TokenStream}; -use proc_macro_crate::crate_name; +use proc_macro_crate::{crate_name, FoundCrate}; use quote::quote; use syn::{ItemEnum, LitStr, Variant}; @@ -9,10 +9,10 @@ use crate::{ }; 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()); 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()); quote! { ::#import::serde } } else {