style: Migrate to stable-only rustfmt configuration
- Remove nightly-only features from .rustfmt.toml and vendor/ss58-registry/rustfmt.toml - Removed features: imports_granularity, wrap_comments, comment_width, reorder_impl_items, spaces_around_ranges, binop_separator, match_arm_blocks, trailing_semicolon, trailing_comma - Format all 898 affected files with stable rustfmt - Ensures long-term reliability without nightly toolchain dependency
This commit is contained in:
@@ -88,8 +88,12 @@ impl ParseRuntimeVersion {
|
||||
fn parse_expr(init_expr: &Expr) -> Result<(ParseRuntimeVersion, Vec<Warning>)> {
|
||||
let init_expr = match init_expr {
|
||||
Expr::Struct(ref e) => e,
|
||||
_ =>
|
||||
return Err(Error::new(init_expr.span(), "expected a struct initializer expression")),
|
||||
_ => {
|
||||
return Err(Error::new(
|
||||
init_expr.span(),
|
||||
"expected a struct initializer expression",
|
||||
))
|
||||
},
|
||||
};
|
||||
|
||||
let mut parsed = ParseRuntimeVersion::default();
|
||||
@@ -103,8 +107,9 @@ impl ParseRuntimeVersion {
|
||||
fn parse_field_value(&mut self, field_value: &FieldValue) -> Result<Vec<Warning>> {
|
||||
let field_name = match field_value.member {
|
||||
syn::Member::Named(ref ident) => ident,
|
||||
syn::Member::Unnamed(_) =>
|
||||
return Err(Error::new(field_value.span(), "only named members must be used")),
|
||||
syn::Member::Unnamed(_) => {
|
||||
return Err(Error::new(field_value.span(), "only named members must be used"))
|
||||
},
|
||||
};
|
||||
|
||||
fn parse_once<T>(
|
||||
@@ -160,11 +165,12 @@ impl ParseRuntimeVersion {
|
||||
fn parse_num_literal(expr: &Expr) -> Result<u32> {
|
||||
let lit = match *expr {
|
||||
Expr::Lit(ExprLit { lit: Lit::Int(ref lit), .. }) => lit,
|
||||
_ =>
|
||||
_ => {
|
||||
return Err(Error::new(
|
||||
expr.span(),
|
||||
"only numeric literals (e.g. `10`) are supported here",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
lit.base10_parse::<u32>()
|
||||
}
|
||||
@@ -172,11 +178,12 @@ impl ParseRuntimeVersion {
|
||||
fn parse_num_literal_u8(expr: &Expr) -> Result<u8> {
|
||||
let lit = match *expr {
|
||||
Expr::Lit(ExprLit { lit: Lit::Int(ref lit), .. }) => lit,
|
||||
_ =>
|
||||
_ => {
|
||||
return Err(Error::new(
|
||||
expr.span(),
|
||||
"only numeric literals (e.g. `10`) are supported here",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
lit.base10_parse::<u8>()
|
||||
}
|
||||
|
||||
@@ -376,43 +376,48 @@ impl<'de> serde::Deserialize<'de> for RuntimeVersion {
|
||||
{
|
||||
let spec_name = match seq.next_element()? {
|
||||
Some(spec_name) => spec_name,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
0usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let impl_name = match seq.next_element()? {
|
||||
Some(impl_name) => impl_name,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
1usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let authoring_version = match seq.next_element()? {
|
||||
Some(authoring_version) => authoring_version,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
2usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let spec_version = match seq.next_element()? {
|
||||
Some(spec_version) => spec_version,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
3usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let impl_version = match seq.next_element()? {
|
||||
Some(impl_version) => impl_version,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
4usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let apis = match {
|
||||
struct DeserializeWith<'de> {
|
||||
@@ -436,27 +441,30 @@ impl<'de> serde::Deserialize<'de> for RuntimeVersion {
|
||||
seq.next_element::<DeserializeWith<'de>>()?.map(|wrap| wrap.value)
|
||||
} {
|
||||
Some(apis) => apis,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
5usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let transaction_version = match seq.next_element()? {
|
||||
Some(transaction_version) => transaction_version,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
6usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
let system_version = match seq.next_element()? {
|
||||
Some(system_version) => system_version,
|
||||
None =>
|
||||
None => {
|
||||
return Err(serde::de::Error::invalid_length(
|
||||
7usize,
|
||||
&"struct RuntimeVersion with 8 elements",
|
||||
)),
|
||||
))
|
||||
},
|
||||
};
|
||||
Ok(RuntimeVersion {
|
||||
spec_name,
|
||||
@@ -528,7 +536,9 @@ impl<'de> serde::Deserialize<'de> for RuntimeVersion {
|
||||
},
|
||||
Field::Apis => {
|
||||
if apis.is_some() {
|
||||
return Err(<A::Error as serde::de::Error>::duplicate_field("apis"));
|
||||
return Err(<A::Error as serde::de::Error>::duplicate_field(
|
||||
"apis",
|
||||
));
|
||||
}
|
||||
apis = Some({
|
||||
struct DeserializeWith<'de> {
|
||||
@@ -558,7 +568,7 @@ impl<'de> serde::Deserialize<'de> for RuntimeVersion {
|
||||
}
|
||||
transaction_version = Some(map.next_value()?);
|
||||
},
|
||||
Field::SystemVersion =>
|
||||
Field::SystemVersion => {
|
||||
if let Some(system_version) = system_version {
|
||||
let new_value = map.next_value::<u8>()?;
|
||||
if system_version != new_value {
|
||||
@@ -572,7 +582,8 @@ impl<'de> serde::Deserialize<'de> for RuntimeVersion {
|
||||
}
|
||||
} else {
|
||||
system_version = Some(map.next_value()?);
|
||||
},
|
||||
}
|
||||
},
|
||||
_ => {
|
||||
map.next_value::<serde::de::IgnoredAny>()?;
|
||||
},
|
||||
@@ -700,9 +711,9 @@ pub fn core_version_from_apis(apis: &ApisVec) -> Option<u32> {
|
||||
impl RuntimeVersion {
|
||||
/// Check if this version matches other version for calling into runtime.
|
||||
pub fn can_call_with(&self, other: &RuntimeVersion) -> bool {
|
||||
self.spec_version == other.spec_version &&
|
||||
self.spec_name == other.spec_name &&
|
||||
self.authoring_version == other.authoring_version
|
||||
self.spec_version == other.spec_version
|
||||
&& self.spec_name == other.spec_name
|
||||
&& self.authoring_version == other.authoring_version
|
||||
}
|
||||
|
||||
/// Check if the given api with `api_id` is implemented and the version passes the given
|
||||
@@ -766,8 +777,8 @@ impl NativeVersion {
|
||||
"`spec_name` does not match `{}` vs `{}`",
|
||||
self.runtime_version.spec_name, other.spec_name,
|
||||
))
|
||||
} else if self.runtime_version.authoring_version != other.authoring_version &&
|
||||
!self.can_author_with.contains(&other.authoring_version)
|
||||
} else if self.runtime_version.authoring_version != other.authoring_version
|
||||
&& !self.can_author_with.contains(&other.authoring_version)
|
||||
{
|
||||
Err(format!(
|
||||
"`authoring_version` does not match `{version}` vs `{other_version}` and \
|
||||
|
||||
Reference in New Issue
Block a user