remove references to the frame-crate

substrate/frame/support/procedural/src/pallet/parse/config.rs

@@ -16,7 +16,7 @@
 // limitations under the License.
 
 use super::helper;
-use frame_support_procedural_tools::{get_doc_literals, is_using_frame_crate};
+use frame_support_procedural_tools::get_doc_literals;
 use quote::ToTokens;
 use syn::{spanned::Spanned, token, Token};
 
@@ -235,16 +235,7 @@ fn check_event_type(
 
 			let has_is_type_bound = type_.bounds.iter().any(|s| {
 				syn::parse2::<IsTypeBoundEventParse>(s.to_token_stream()).map_or(false, |b| {
-					let mut expected_system_config = if is_using_frame_crate(&frame_system) {
-						// in this case we know that the only valid frame_system path is one that is
-						// `frame_system`, as `frame` re-exports it as such.
-						let fixed_frame_system =
-							syn::parse2::<syn::Path>(quote::quote!(frame_system))
-								.expect("is a valid path; qed");
-						fixed_frame_system
-					} else {
-						frame_system.clone()
-					};
+					let mut expected_system_config = frame_system.clone();
 					expected_system_config
 						.segments
 						.push(syn::PathSegment::from(syn::Ident::new("Config", b.0.span())));
@@ -346,16 +337,7 @@ impl ConfigDef {
 
 		let has_frame_system_supertrait = item.supertraits.iter().any(|s| {
 			syn::parse2::<syn::Path>(s.to_token_stream()).map_or(false, |b| {
-				let mut expected_system_config = if is_using_frame_crate(&frame_system) {
-					// in this case we know that the only valid supertrait is one that is
-					// `frame_system::Config`, as `frame` re-exports it as such.
-					let fixed_frame_system = syn::parse2::<syn::Path>(quote::quote!(frame_system))
-						.expect("is a valid path; qed");
-					fixed_frame_system
-				} else {
-					// a possible renamed frame-system, which is a direct dependency.
-					frame_system.clone()
-				};
+				let mut expected_system_config = frame_system.clone();
 				expected_system_config
 					.segments
 					.push(syn::PathSegment::from(syn::Ident::new("Config", b.span())));

substrate/frame/support/procedural/tools/src/lib.rs

@@ -46,23 +46,10 @@ pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	}
 }
 
-/// Check if the output of [`generate_crate_access_2018`] (or generally another path) is using the
-/// `frame` crate or not.
-pub fn is_using_frame_crate(path: &syn::Path) -> bool {
-	path.segments.first().map(|s| s.ident == "frame").unwrap_or(false)
-}
-
 /// Generate the crate access for the crate using 2018 syntax.
 ///
-/// If `frame` is in scope, it will use `frame::deps::<def_crate>`. Else, it will try and find
-/// `<def_crate>` directly.
+/// for `frame-support` output will for example be `frame_support`.
 pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Path, Error> {
-	if let Ok(FoundCrate::Name(name)) = crate_name(&"frame") {
-		let path = format!("{}::deps::{}", name, def_crate.to_string().replace("-", "_"));
-		let path = syn::parse_str::<syn::Path>(&path)?;
-		return Ok(path)
-	}
-
 	let indent = match crate_name(def_crate) {
 		Ok(FoundCrate::Itself) => {
 			let name = def_crate.to_string().replace("-", "_");
@@ -79,17 +66,6 @@ pub fn generate_crate_access_2018(def_crate: &str) -> Result<syn::Path, Error> {
 pub fn generate_hidden_includes(unique_id: &str, def_crate: &str) -> TokenStream {
 	let mod_name = generate_hidden_includes_mod_name(unique_id);
 
-	if let Ok(FoundCrate::Name(name)) = crate_name(&"frame") {
-		let path = format!("{}::deps::{}", name, def_crate.to_string().replace("-", "_"));
-		let path = syn::parse_str::<syn::Path>(&path).expect("is a valid path; qed");
-		return quote::quote!(
-			#[doc(hidden)]
-			mod #mod_name {
-				pub use #path as hidden_include;
-			}
-		)
-	}
-
 	match crate_name(def_crate) {
 		Ok(FoundCrate::Itself) => quote!(),
 		Ok(FoundCrate::Name(name)) => {

substrate/primitives/api/proc-macro/src/utils.rs

@@ -27,13 +27,6 @@ use syn::{
 
 /// Generates the access to the `sc_client` crate.
 pub fn generate_crate_access() -> TokenStream {
-	if let Ok(FoundCrate::Name(name)) = crate_name(&"frame") {
-		// TODO: add test to make sure `frame` always contains `frame::deps::sp_api`.
-		// TODO: handle error.
-		let path = format!("{}::deps::{}", name, "sp_api");
-		let path = syn::parse_str::<syn::Path>(&path).unwrap();
-		return path.into_token_stream()
-	}
 	match crate_name("sp-api") {
 		Ok(FoundCrate::Itself) => quote!(sp_api),
 		Ok(FoundCrate::Name(renamed_name)) => {