Restore leading :: for crate access (#152)

* Restore leading `::` for crate access * Fmt * Fix it for real * Fmt * Restore changes * Revert test changes * Add ui test for `#![no_implicit_prelude]` * Add ui test for `#![no_implicit_prelude]` * Bump versions * Update CHANGELOG
paritytech · Apr 13, 2022 · 7140f90 · 7140f90
1 parent 7f20fa1
commit 7140f90
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.1] - 2022-04-11
+
+### Fixed
+- Restore leading `::` for crate access [(#152)](https://github.com/paritytech/scale-info/pull/152)
+
 ## [2.1.0] - 2022-04-11
 
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scale-info"
-version = "2.1.0"
+version = "2.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 rust-version = "1.56.1"
@@ -17,7 +17,7 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 [dependencies]
 bitvec = { version = "1", default-features = false, features = ["alloc"], optional = true }
 cfg-if = "1.0"
-scale-info-derive = { version = "2.1.0", path = "derive", default-features = false, optional = true }
+scale-info-derive = { version = "2.1.1", path = "derive", default-features = false, optional = true }
 serde = { version = "1", default-features = false, optional = true, features = ["derive", "alloc"] }
 derive_more = { version = "0.99.1", default-features = false, features = ["from"] }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }

diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scale-info-derive"
-version = "2.1.0"
+version = "2.1.1"
 authors = [
     "Parity Technologies <admin@parity.io>",
     "Centrality Developers <support@centrality.ai>",

diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -288,13 +288,16 @@ impl TypeInfoImpl {
 }
 
 /// Get the name of a crate, to be robust against renamed dependencies.
-fn crate_name_ident(name: &str) -> Result<Ident> {
+fn crate_name_path(name: &str) -> Result<syn::Path> {
     proc_macro_crate::crate_name(name)
         .map(|crate_name| {
             use proc_macro_crate::FoundCrate::*;
             match crate_name {
-                Itself => Ident::new("self", Span::call_site()),
-                Name(name) => Ident::new(&name, Span::call_site()),
+                Itself => Ident::new("self", Span::call_site()).into(),
+                Name(name) => {
+                    let crate_ident = Ident::new(&name, Span::call_site());
+                    parse_quote!( ::#crate_ident )
+                }
             }
         })
         .map_err(|e| syn::Error::new(Span::call_site(), &e))
@@ -303,7 +306,7 @@ fn crate_name_ident(name: &str) -> Result<Ident> {
 fn crate_path(crate_path_attr: Option<&CratePathAttr>) -> Result<syn::Path> {
     crate_path_attr
         .map(|path_attr| Ok(path_attr.path().clone()))
-        .unwrap_or_else(|| crate_name_ident("scale-info").map(|ident| ident.into()))
+        .unwrap_or_else(|| crate_name_path("scale-info"))
 }
 
 fn clean_type_string(input: &str) -> String {

diff --git a/derive/src/trait_bounds.rs b/derive/src/trait_bounds.rs
@@ -96,11 +96,11 @@ pub fn make_where_clause<'a>(
         if is_compact {
             where_clause
                 .predicates
-                .push(parse_quote!(#ty : :: #scale_info :: scale::HasCompact));
+                .push(parse_quote!(#ty : #scale_info :: scale::HasCompact));
         } else {
             where_clause
                 .predicates
-                .push(parse_quote!(#ty : :: #scale_info ::TypeInfo + 'static));
+                .push(parse_quote!(#ty : #scale_info ::TypeInfo + 'static));
         }
     });
 
@@ -111,7 +111,7 @@ pub fn make_where_clause<'a>(
             .skip_type_params()
             .map_or(true, |skip| !skip.skip(type_param))
         {
-            bounds.push(parse_quote!(:: #scale_info ::TypeInfo));
+            bounds.push(parse_quote!(#scale_info ::TypeInfo));
         }
         bounds.push(parse_quote!('static));
         where_clause

diff --git a/test_suite/tests/ui/pass_no_implicit_prelude.rs b/test_suite/tests/ui/pass_no_implicit_prelude.rs
@@ -0,0 +1,14 @@
+#![no_implicit_prelude]
+
+use ::info::{self as scale_info};
+use scale_info::TypeInfo;
+
+#[allow(dead_code)]
+#[derive(TypeInfo)]
+struct S { a: bool }
+
+fn assert_type_info<T: TypeInfo + 'static>() {}
+
+fn main() {
+    assert_type_info::<S>();
+}