Bump proc-macro-crate to v1.0.0 (#127)

Signed-off-by: koushiro <koushiro.cqx@gmail.com>

Author: koushiro

.github/workflows/build.yml

@@ -54,8 +54,8 @@ jobs:
           command: test
           args: --all-features --workspace
 
-  ensure_no_std:
-    name: Ensure no_std
+  build-no-std:
+    name: Build no_std
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources

.gitignore

@@ -1,3 +1,4 @@
 target
 Cargo.lock
-*.bk
+*.bk
+.idea

derive/Cargo.toml

@@ -12,7 +12,7 @@ proc-macro = true
 
 [dependencies]
 proc-macro2 = { version = "1.0.24", features = ["span-locations"] }
-proc-macro-crate = "0.1.5"
+proc-macro-crate = "1.0.0"
 proc-macro-error = "1.0.4"
 quote = "1.0.7"
 syn = "1.0.42"

derive/src/multihash.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use crate::utils;
-use proc_macro2::TokenStream;
+use proc_macro2::{Span, TokenStream};
 use quote::quote;
 #[cfg(not(test))]
 use quote::ToTokens;
@@ -152,8 +152,8 @@ impl<'a> From<&'a VariantInfo<'a>> for Hash {
         Self {
             ident,
             code,
-            digest,
             hasher,
+            digest,
         }
     }
 }
@@ -224,7 +224,7 @@ fn error_code_duplicates(hashes: &[Hash]) {
 
 /// An error that contains a span in order to produce nice error messages.
 #[derive(Debug)]
-struct ParseError(proc_macro2::Span);
+struct ParseError(Span);
 
 /// Parse a path containing a `typenum` unsigned integer (e.g. `U64`) into a u64
 fn parse_unsigned_typenum(typenum_path: &syn::Type) -> Result<u64, ParseError> {
@@ -314,7 +314,13 @@ fn error_alloc_size(hashes: &[Hash], expected_alloc_size_type: &syn::Type) {
 }
 
 pub fn multihash(s: Structure) -> TokenStream {
-    let mh_crate = utils::use_crate("multihash");
+    let mh_crate = match utils::use_crate("multihash") {
+        Ok(ident) => ident,
+        Err(e) => {
+            let err = syn::Error::new(Span::call_site(), e).to_compile_error();
+            return quote!(#err);
+        }
+    };
     let code_enum = &s.ast().ident;
     let (alloc_size, no_alloc_size_errors) = parse_code_enum_attrs(&s.ast());
     let hashes: Vec<_> = s.variants().iter().map(Hash::from).collect();

derive/src/utils.rs

@@ -1,10 +1,15 @@
 use proc_macro2::Span;
+use proc_macro_crate::{crate_name, FoundCrate};
 use syn::parse::{Parse, ParseStream};
 use syn::punctuated::Punctuated;
+use syn::Error;
 
-pub fn use_crate(name: &str) -> syn::Ident {
-    let krate = proc_macro_crate::crate_name(name).unwrap_or_else(|_| "crate".into());
-    syn::Ident::new(&krate, Span::call_site())
+pub fn use_crate(name: &str) -> Result<syn::Ident, Error> {
+    match crate_name(name) {
+        Ok(FoundCrate::Name(krate)) => Ok(syn::Ident::new(&krate, Span::call_site())),
+        Ok(FoundCrate::Itself) => Ok(syn::Ident::new("crate", Span::call_site())),
+        Err(err) => Err(Error::new(Span::call_site(), err)),
+    }
 }
 
 #[derive(Debug)]