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

clippy fixes (#9173)

Browse Source
This commit is contained in:
Squirrel
2021-07-26 14:12:18 +01:00
committed by GitHub
parent 17c6477683
commit ec047abbcf
5 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/chain-spec/derive/src/impls.rs
+2 -2
View File
@@ -76,7 +76,7 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
let fork_name = Ident::new(&format!("{}Fork", name), Span::call_site()); let fork_name = Ident::new(&format!("{}Fork", name), Span::call_site());
let fork_fields = generate_fork_fields(&crate_name, &field_names, &field_types); let fork_fields = generate_fork_fields(crate_name, &field_names, &field_types);
let to_fork = generate_base_to_fork(&fork_name, &field_names); let to_fork = generate_base_to_fork(&fork_name, &field_names);
let combine_with = generate_combine_with(&field_names); let combine_with = generate_combine_with(&field_names);
let to_base = generate_fork_to_base(name, &field_names); let to_base = generate_fork_to_base(name, &field_names);
@@ -88,7 +88,7 @@ pub fn group_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
Error::new(Span::call_site(), &format!("Could not find `serde` crate: {}", e)) Error::new(Span::call_site(), &format!("Could not find `serde` crate: {}", e))
.to_compile_error(); .to_compile_error();
return quote!( #err ).into() return quote!( #err )
}, },
}; };
substrate/frame/staking/reward-curve/src/lib.rs
+20 -23
View File
@@ -62,14 +62,14 @@ use syn::parse::{Parse, ParseStream};
/// use sp_runtime::curve::PiecewiseLinear; /// use sp_runtime::curve::PiecewiseLinear;
/// ///
/// pallet_staking_reward_curve::build! { /// pallet_staking_reward_curve::build! {
/// const I_NPOS: PiecewiseLinear<'static> = curve!( /// const I_NPOS: PiecewiseLinear<'static> = curve!(
/// min_inflation: 0_025_000, /// min_inflation: 0_025_000,
/// max_inflation: 0_100_000, /// max_inflation: 0_100_000,
/// ideal_stake: 0_500_000, /// ideal_stake: 0_500_000,
/// falloff: 0_050_000, /// falloff: 0_050_000,
/// max_piece_count: 40, /// max_piece_count: 40,
/// test_precision: 0_005_000, /// test_precision: 0_005_000,
/// ); /// );
/// } /// }
/// ``` /// ```
#[proc_macro] #[proc_macro]
@@ -163,9 +163,9 @@ fn parse_field<Token: Parse + Default + ToTokens>(
input: ParseStream, input: ParseStream,
bounds: Bounds, bounds: Bounds,
) -> syn::Result<u32> { ) -> syn::Result<u32> {
<Token>::parse(&input)?; <Token>::parse(input)?;
<syn::Token![:]>::parse(&input)?; <syn::Token![:]>::parse(input)?;
let value_lit = syn::LitInt::parse(&input)?; let value_lit = syn::LitInt::parse(input)?;
let value: u32 = value_lit.base10_parse()?; let value: u32 = value_lit.base10_parse()?;
if !bounds.check(value) { if !bounds.check(value) {
return Err(syn::Error::new( return Err(syn::Error::new(
@@ -186,15 +186,15 @@ impl Parse for INposInput {
fn parse(input: ParseStream) -> syn::Result<Self> { fn parse(input: ParseStream) -> syn::Result<Self> {
let args_input; let args_input;
<syn::Token![const]>::parse(&input)?; <syn::Token![const]>::parse(input)?;
let ident = <syn::Ident>::parse(&input)?; let ident = <syn::Ident>::parse(input)?;
<syn::Token![:]>::parse(&input)?; <syn::Token![:]>::parse(input)?;
let typ = <syn::Type>::parse(&input)?; let typ = <syn::Type>::parse(input)?;
<syn::Token![=]>::parse(&input)?; <syn::Token![=]>::parse(input)?;
<keyword::curve>::parse(&input)?; <keyword::curve>::parse(input)?;
<syn::Token![!]>::parse(&input)?; <syn::Token![!]>::parse(input)?;
syn::parenthesized!(args_input in input); syn::parenthesized!(args_input in input);
<syn::Token![;]>::parse(&input)?; <syn::Token![;]>::parse(input)?;
if !input.is_empty() { if !input.is_empty() {
return Err(input.error("expected end of input stream, no token expected")) return Err(input.error("expected end of input stream, no token expected"))
@@ -288,9 +288,7 @@ impl INPoS {
fn compute_points(input: &INposInput) -> Vec<(u32, u32)> { fn compute_points(input: &INposInput) -> Vec<(u32, u32)> {
let inpos = INPoS::from_input(input); let inpos = INPoS::from_input(input);
let mut points = vec![]; let mut points = vec![(0, inpos.i_0), (inpos.x_ideal, inpos.i_ideal_times_x_ideal)];
points.push((0, inpos.i_0));
points.push((inpos.x_ideal, inpos.i_ideal_times_x_ideal));
// For each point p: (next_p.0 - p.0) < segment_length && (next_p.1 - p.1) < segment_length. // For each point p: (next_p.0 - p.0) < segment_length && (next_p.1 - p.1) < segment_length.
// This ensures that the total number of segment doesn't overflow max_piece_count. // This ensures that the total number of segment doesn't overflow max_piece_count.
@@ -445,5 +443,4 @@ fn generate_test_module(input: &INposInput) -> TokenStream2 {
} }
} }
) )
.into()
} }
substrate/frame/staking/reward-curve/src/log.rs
+3 -3
View File
@@ -46,14 +46,14 @@ pub fn log2(p: u32, q: u32) -> u32 {
// find the power of 2 where q * 2^n <= p < q * 2^(n+1) // find the power of 2 where q * 2^n <= p < q * 2^(n+1)
let mut n = 0u32; let mut n = 0u32;
while !(p >= pow2!(n) * q) || !(p < pow2!(n + 1) * q) { while (p < pow2!(n) * q) || (p >= pow2!(n + 1) * q) {
n += 1; n += 1;
assert!(n < 32); // cannot represent 2^32 in u32 assert!(n < 32); // cannot represent 2^32 in u32
} }
assert!(p < pow2!(n + 1) * q); assert!(p < pow2!(n + 1) * q);
let y_num: u32 = (p - pow2!(n) * q).try_into().unwrap(); let y_num: u32 = p - pow2!(n) * q;
let y_den: u32 = (p + pow2!(n) * q).try_into().unwrap(); let y_den: u32 = p + pow2!(n) * q;
// Loop through each Taylor series coefficient until it reaches 10^-6 // Loop through each Taylor series coefficient until it reaches 10^-6
let mut res = n * 1_000_000u32; let mut res = n * 1_000_000u32;
substrate/primitives/npos-elections/compact/src/lib.rs
+1 -1
View File
@@ -89,7 +89,7 @@ pub fn generate_solution_type(item: TokenStream) -> TokenStream {
let solution_struct = struct_def( let solution_struct = struct_def(
vis, vis,
ident.clone(), ident,
count, count,
voter_type.clone(), voter_type.clone(),
target_type.clone(), target_type.clone(),
substrate/primitives/utils/src/mpsc.rs
+3 -5
View File
@@ -101,7 +101,7 @@ mod inner {
/// Proxy function to mpsc::UnboundedSender /// Proxy function to mpsc::UnboundedSender
pub fn unbounded_send(&self, msg: T) -> Result<(), TrySendError<T>> { pub fn unbounded_send(&self, msg: T) -> Result<(), TrySendError<T>> {
self.1.unbounded_send(msg).map(|s| { self.1.unbounded_send(msg).map(|s| {
UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"send"]).inc(); UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "send"]).inc();
s s
}) })
} }
@@ -128,9 +128,7 @@ mod inner {
} }
// and discount the messages // and discount the messages
if count > 0 { if count > 0 {
UNBOUNDED_CHANNELS_COUNTER UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "dropped"]).inc_by(count);
.with_label_values(&[self.0, &"dropped"])
.inc_by(count);
} }
} }
@@ -146,7 +144,7 @@ mod inner {
pub fn try_next(&mut self) -> Result<Option<T>, TryRecvError> { pub fn try_next(&mut self) -> Result<Option<T>, TryRecvError> {
self.1.try_next().map(|s| { self.1.try_next().map(|s| {
if s.is_some() { if s.is_some() {
UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, &"received"]).inc(); UNBOUNDED_CHANNELS_COUNTER.with_label_values(&[self.0, "received"]).inc();
} }
s s
}) })