Addresses review comment

frame/balances/src/lib.rs

@@ -225,7 +225,7 @@ pub mod pallet {
 
 		#[frame_support::register_default_impl(TestDefaultConfig)]
 		impl DefaultConfig for TestDefaultConfig {
-			#[runtime_type]
+			#[inject_runtime_type]
 			type RuntimeEvent = ();
 
 			type Balance = u64;

frame/examples/default-config/src/lib.rs

@@ -172,7 +172,7 @@ pub mod tests {
 		// type BlockHashCount = frame_support::traits::ConstU64<10>;
 		// type OnSetCode = ();
 
-		// These are marked as `#[runtime_type]`. Hence, they are being injected as
+		// These are marked as `#[inject_runtime_type]`. Hence, they are being injected as
 		// types generated by `construct_runtime`.
 
 		// type RuntimeOrigin = RuntimeOrigin;

frame/support/procedural/src/derive_impl.rs

@@ -27,14 +27,14 @@ use syn::{
 };
 
 mod keyword {
-	syn::custom_keyword!(runtime_type);
+	syn::custom_keyword!(inject_runtime_type);
 	syn::custom_keyword!(no_aggregated_types);
 }
 
 #[derive(derive_syn_parse::Parse, PartialEq, Eq)]
 pub enum PalletAttrType {
-	#[peek(keyword::runtime_type, name = "runtime_type")]
-	RuntimeType(keyword::runtime_type),
+	#[peek(keyword::inject_runtime_type, name = "inject_runtime_type")]
+	RuntimeType(keyword::inject_runtime_type),
 }
 
 #[derive(derive_syn_parse::Parse)]

frame/support/procedural/src/lib.rs

@@ -606,7 +606,7 @@ pub fn storage_alias(attributes: TokenStream, input: TokenStream) -> TokenStream
 /// ```
 ///
 /// If specified, this indicates that the aggregated types (as denoted by impl items
-/// attached with [`#[runtime_type]`]) should not be injected with the respective concrete types. By
+/// attached with [`#[inject_runtime_type]`]) should not be injected with the respective concrete types. By
 /// default, all such types are injected.
 ///
 /// You can also make use of `#[pallet::no_default]` on specific items in your default impl that you
@@ -870,18 +870,18 @@ pub fn register_default_impl(attrs: TokenStream, tokens: TokenStream) -> TokenSt
 	}
 }
 
-/// The optional attribute `#[runtime_type]` can be attached to `RuntimeCall`, `RuntimeEvent`,
+/// The optional attribute `#[inject_runtime_type]` can be attached to `RuntimeCall`, `RuntimeEvent`,
 /// `RuntimeOrigin` or `PalletInfo` in an impl statement that has `#[register_default_impl]`
 /// attached to indicate that this item is generated by `construct_runtime`.
 ///
 /// Attaching this attribute to such an item ensures that the combined impl generated via
 /// [`#[derive_impl(..)]`](`macro@derive_impl`)  will use the correct type auto-generated by
 /// [`construct_runtime!`].
 ///
-/// As an example, if you have an impl item `#[runtime_type] type RuntimeEvent = ();` in
+/// As an example, if you have an impl item `#[inject_runtime_type] type RuntimeEvent = ();` in
 /// your impl statement, the combined impl will have `type RuntimeEvent = RuntimeEvent;` instead.
 #[proc_macro_attribute]
-pub fn runtime_type(_: TokenStream, tokens: TokenStream) -> TokenStream {
+pub fn inject_runtime_type(_: TokenStream, tokens: TokenStream) -> TokenStream {
 	let item = tokens.clone();
 	let item = syn::parse_macro_input!(item as TraitItemType);
 	if item.ident != "RuntimeCall" &&
@@ -891,7 +891,7 @@ pub fn runtime_type(_: TokenStream, tokens: TokenStream) -> TokenStream {
 	{
 		return syn::Error::new_spanned(
 			item,
-			"`#[runtime_type]` can only be attached to `RuntimeCall`, `RuntimeEvent`, `RuntimeOrigin` or `PalletInfo`",
+			"`#[inject_runtime_type]` can only be attached to `RuntimeCall`, `RuntimeEvent`, `RuntimeOrigin` or `PalletInfo`",
 		)
 		.to_compile_error()
 		.into();

frame/support/src/lib.rs

@@ -2180,7 +2180,7 @@ pub mod pallet_macros {
 		call_index, compact, composite_enum, config, constant,
 		disable_frame_system_supertrait_check, error, event, extra_constants, generate_deposit,
 		generate_store, genesis_build, genesis_config, getter, hooks, import_section, inherent,
-		no_default, no_default_bounds, origin, pallet_section, runtime_type, storage,
+		no_default, no_default_bounds, origin, pallet_section, inject_runtime_type, storage,
 		storage_prefix, storage_version, type_value, unbounded, validate_unsigned, weight,
 		whitelist_storage,
 	};

frame/support/test/tests/derive_impl_ui/pass/runtime_type_working.rs

@@ -1,4 +1,4 @@
-use frame_support::{*, pallet_macros::runtime_type};
+use frame_support::{*, pallet_macros::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
 pub trait Config {
@@ -11,7 +11,7 @@ struct Pallet;
 
 #[register_default_impl(Pallet)]
 impl Config for Pallet {
-    #[runtime_type]
+    #[inject_runtime_type]
     type RuntimeCall = ();
 }
 

frame/support/test/tests/derive_impl_ui/runtime_type_fails_when_type_not_in_scope.rs

@@ -1,4 +1,4 @@
-use frame_support::{*, pallet_macros::runtime_type};
+use frame_support::{*, pallet_macros::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
 pub trait Config {
@@ -9,7 +9,7 @@ struct Pallet;
 
 #[register_default_impl(Pallet)]
 impl Config for Pallet {
-    #[runtime_type]
+    #[inject_runtime_type]
     type RuntimeCall = ();
 }
 

frame/support/test/tests/derive_impl_ui/runtime_type_fails_when_type_not_in_scope.stderr

@@ -1,5 +1,5 @@
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/derive_impl_ui/runtime_type_fails_when_type_not_in_scope.rs:13:10
+  --> tests/derive_impl_ui/inject_runtime_type_fails_when_type_not_in_scope.rs:13:10
    |
 13 |     type RuntimeCall = ();
    |          ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`

frame/support/test/tests/derive_impl_ui/runtime_type_invalid.rs

@@ -1,4 +1,4 @@
-use frame_support::{*, pallet_macros::runtime_type};
+use frame_support::{*, pallet_macros::inject_runtime_type};
 use static_assertions::assert_type_eq_all;
 
 pub trait Config {
@@ -11,7 +11,7 @@ struct Pallet;
 
 #[register_default_impl(Pallet)]
 impl Config for Pallet {
-    #[runtime_type]
+    #[inject_runtime_type]
     type RuntimeInfo = ();
 }
 

frame/support/test/tests/derive_impl_ui/runtime_type_invalid.stderr

@@ -1,11 +1,11 @@
-error: `#[runtime_type]` can only be attached to `RuntimeCall`, `RuntimeEvent`, `RuntimeOrigin` or `PalletInfo`
-  --> tests/derive_impl_ui/runtime_type_invalid.rs:15:5
+error: `#[inject_runtime_type]` can only be attached to `RuntimeCall`, `RuntimeEvent`, `RuntimeOrigin` or `PalletInfo`
+  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:15:5
    |
 15 |     type RuntimeInfo = ();
    |     ^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0046]: not all trait items implemented, missing: `RuntimeInfo`
-  --> tests/derive_impl_ui/runtime_type_invalid.rs:13:1
+  --> tests/derive_impl_ui/inject_runtime_type_invalid.rs:13:1
    |
 5  |     type RuntimeInfo;
    |     ---------------- `RuntimeInfo` from trait

frame/system/src/lib.rs

@@ -205,7 +205,7 @@ pub mod pallet {
 
 	/// Default implementations of [`DefaultConfig`], which can be used to implement [`Config`].
 	pub mod config_preludes {
-		use super::{runtime_type, DefaultConfig};
+		use super::{inject_runtime_type, DefaultConfig};
 
 		/// Provides a viable default config that can be used with
 		/// [`derive_impl`](`frame_support::derive_impl`) to derive a testing pallet config
@@ -232,13 +232,13 @@ pub mod pallet {
 			type BlockWeights = ();
 			type BlockLength = ();
 			type DbWeight = ();
-			#[runtime_type]
+			#[inject_runtime_type]
 			type RuntimeEvent = ();
-			#[runtime_type]
+			#[inject_runtime_type]
 			type RuntimeOrigin = ();
-			#[runtime_type]
+			#[inject_runtime_type]
 			type RuntimeCall = ();
-			#[runtime_type]
+			#[inject_runtime_type]
 			type PalletInfo = ();
 			type BaseCallFilter = frame_support::traits::Everything;
 			type BlockHashCount = frame_support::traits::ConstU64<10>;