pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 11:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert another instance of Into impl to From in the macros (#8986)

Browse Source 
* Convert another instance of Into impl to From in the macros

* Convert another location
This commit is contained in:
MOZGIII
2021-06-01 23:48:31 +03:00
committed by GitHub
parent 29a7559fe3
commit e63730b763
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/procedural/src/construct_runtime/expand/origin.rs
+8 -8
View File
@@ -227,13 +227,13 @@ pub fn expand_outer_origin(
}
}
impl Into<#scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Origin>> for Origin {
impl From<Origin> for #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Origin> {
/// NOTE: converting to pallet origin loses the origin filter information.
fn into(self) -> #scrate::sp_std::result::Result<#system_path::Origin<#runtime>, Self> {
if let OriginCaller::system(l) = self.caller {
fn from(val: Origin) -> Self {
if let OriginCaller::system(l) = val.caller {
Ok(l)
} else {
Err(self)
Err(val)
}
}
}
@@ -314,13 +314,13 @@ fn expand_origin_pallet_conversions(
}
}
impl Into<#scrate::sp_std::result::Result<#pallet_origin, Origin>> for Origin {
impl From<Origin> for #scrate::sp_std::result::Result<#pallet_origin, Origin> {
/// NOTE: converting to pallet origin loses the origin filter information.
fn into(self) -> #scrate::sp_std::result::Result<#pallet_origin, Self> {
if let OriginCaller::#variant(l) = self.caller {
fn from(val: Origin) -> Self {
if let OriginCaller::#variant(l) = val.caller {
Ok(l)
} else {
Err(self)
Err(val)
}
}
}
substrate/frame/support/src/origin.rs
+6 -10
View File
@@ -382,21 +382,17 @@ macro_rules! impl_outer_origin {
x.into()
}
}
impl Into<
$crate::sp_std::result::Result<
impl From<$name> for $crate::sp_std::result::Result<
$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
$name,
>>
for $name {
>
{
/// NOTE: converting to pallet origin loses the origin filter information.
fn into(self) -> $crate::sp_std::result::Result<
$module::Origin < $( $generic )? $(, $module::$generic_instance )? >,
Self,
> {
if let $caller_name::[< $module $( _ $generic_instance )? >](l) = self.caller {
fn from(val: $name) -> Self {
if let $caller_name::[< $module $( _ $generic_instance )? >](l) = val.caller {
Ok(l)
} else {
Err(self)
Err(val)
}
}
}