From ca292b91f7fd1c508ccd458bf10b57534b2ddb20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <30413512+eclipseo@users.noreply.github.com> Date: Sat, 10 Jul 2021 19:34:13 +0200 Subject: [PATCH 1/2] Bump proc-macro-crate to 1 --- num_enum_derive/Cargo.toml | 2 +- num_enum_derive/src/lib.rs | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/num_enum_derive/Cargo.toml b/num_enum_derive/Cargo.toml index e47b9ee..64529bb 100644 --- a/num_enum_derive/Cargo.toml +++ b/num_enum_derive/Cargo.toml @@ -32,6 +32,6 @@ features = ["external_doc"] [dependencies] proc-macro2 = "1" -proc-macro-crate = { version = "0.1.4", optional = true } +proc-macro-crate = { version = "1", optional = true } quote = "1" syn = { version = "1", features = ["parsing"] } diff --git a/num_enum_derive/src/lib.rs b/num_enum_derive/src/lib.rs index bc237f5..04342aa 100644 --- a/num_enum_derive/src/lib.rs +++ b/num_enum_derive/src/lib.rs @@ -574,10 +574,17 @@ pub fn derive_try_from_primitive(input: TokenStream) -> TokenStream { #[cfg(feature = "proc-macro-crate")] fn get_crate_name() -> String { - ::proc_macro_crate::crate_name("num_enum").unwrap_or_else(|err| { + let found_crate = proc_macro_crate::crate_name("num_enum").unwrap_or_else(|err| { eprintln!("Warning: {}\n => defaulting to `num_enum`", err,); - String::from("num_enum") - }) + proc_macro_crate::FoundCrate::Itself + }); + + let crate_name = match found_crate { + proc_macro_crate::FoundCrate::Itself => String::from("num_enum"), + proc_macro_crate::FoundCrate::Name(name) => name + }; + + crate_name } // Don't depend on proc-macro-crate in no_std environments because it causes an awkward dependency From 9baf14208d0752c991e6f9d758fef8664fec08fe Mon Sep 17 00:00:00 2001 From: Daniel Wagner-Hall Date: Sat, 10 Jul 2021 20:06:02 +0100 Subject: [PATCH 2/2] fmt --- num_enum_derive/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/num_enum_derive/src/lib.rs b/num_enum_derive/src/lib.rs index 04342aa..0bffadb 100644 --- a/num_enum_derive/src/lib.rs +++ b/num_enum_derive/src/lib.rs @@ -581,7 +581,7 @@ fn get_crate_name() -> String { let crate_name = match found_crate { proc_macro_crate::FoundCrate::Itself => String::from("num_enum"), - proc_macro_crate::FoundCrate::Name(name) => name + proc_macro_crate::FoundCrate::Name(name) => name, }; crate_name