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

Apply some clippy lints (#11154)

Browse Source 
* Apply some clippy hints

* Revert clippy ci changes

* Update client/cli/src/commands/generate.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/cli/src/commands/inspect_key.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/db/src/bench.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/src/client/block_rules.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/transactions.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/network/src/protocol.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Revert due to missing `or_default` function.

* Fix compilation and simplify code

* Undo change that corrupts benchmark.

* fix clippy

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/state-db/src/noncanonical.rs

remove leftovers!

* Update client/tracing/src/logging/directives.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/fork-tree/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* added needed ref

* Update frame/referenda/src/benchmarking.rs

* Simplify byte-vec creation

* let's just not overlap the ranges

* Correction

* cargo fmt

* Update utils/frame/benchmarking-cli/src/shared/stats.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update utils/frame/benchmarking-cli/src/pallet/command.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
Co-authored-by: Giles Cope <gilescope@gmail.com>
This commit is contained in:
Falco Hirschenberger
2022-04-30 23:28:27 +02:00
committed by GitHub
parent a990473cf9
commit b581604aa7
368 changed files with 1927 additions and 2236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/tracing/src/block/mod.rs
+11 -9
View File
@@ -108,7 +108,7 @@ impl BlockSubscriber {
impl Subscriber for BlockSubscriber {
fn enabled(&self, metadata: &tracing::Metadata<'_>) -> bool {
if !metadata.is_span() && !metadata.fields().field(REQUIRED_EVENT_FIELD).is_some() {
if !metadata.is_span() && metadata.fields().field(REQUIRED_EVENT_FIELD).is_none() {
return false
}
for (target, level) in &self.targets {
@@ -221,12 +221,12 @@ where
let mut header = self
.client
.header(id)
.map_err(|e| Error::InvalidBlockId(e))?
.map_err(Error::InvalidBlockId)?
.ok_or_else(|| Error::MissingBlockComponent("Header not found".to_string()))?;
let extrinsics = self
.client
.block_body(&id)
.map_err(|e| Error::InvalidBlockId(e))?
.map_err(Error::InvalidBlockId)?
.ok_or_else(|| Error::MissingBlockComponent("Extrinsics not found".to_string()))?;
tracing::debug!(target: "state_tracing", "Found {} extrinsics", extrinsics.len());
let parent_hash = *header.parent_hash();
@@ -252,16 +252,18 @@ where
let _enter = span.enter();
self.client.runtime_api().execute_block(&parent_id, block)
}) {
return Err(Error::Dispatch(
format!("Failed to collect traces and execute block: {}", e).to_string(),
))
return Err(Error::Dispatch(format!(
"Failed to collect traces and execute block: {}",
e
)))
}
}
let block_subscriber =
dispatch.downcast_ref::<BlockSubscriber>().ok_or(Error::Dispatch(
let block_subscriber = dispatch.downcast_ref::<BlockSubscriber>().ok_or_else(|| {
Error::Dispatch(
"Cannot downcast Dispatch to BlockSubscriber after tracing block".to_string(),
))?;
)
})?;
let spans: Vec<_> = block_subscriber
.spans
.lock()
substrate/client/tracing/src/lib.rs
+2 -3
View File
@@ -166,8 +166,7 @@ impl Visit for Values {
}
fn record_debug(&mut self, field: &Field, value: &dyn std::fmt::Debug) {
self.string_values
.insert(field.name().to_string(), format!("{:?}", value).to_owned());
self.string_values.insert(field.name().to_string(), format!("{:?}", value));
}
}
@@ -239,7 +238,7 @@ impl ProfilingLayer {
/// or without: "pallet" in which case the level defaults to `trace`.
/// wasm_tracing indicates whether to enable wasm traces
pub fn new_with_handler(trace_handler: Box<dyn TraceHandler>, targets: &str) -> Self {
let targets: Vec<_> = targets.split(',').map(|s| parse_target(s)).collect();
let targets: Vec<_> = targets.split(',').map(parse_target).collect();
Self { targets, trace_handlers: vec![trace_handler] }
}
substrate/client/tracing/src/logging/directives.rs
+1 -1
View File
@@ -84,7 +84,7 @@ pub fn reload_filter() -> Result<(), String> {
log::debug!(target: "tracing", "Reloading log filter with: {}", env_filter);
FILTER_RELOAD_HANDLE
.get()
.ok_or("No reload handle present".to_string())?
.ok_or("No reload handle present")?
.reload(env_filter)
.map_err(|e| format!("{}", e))
}
substrate/client/tracing/src/logging/mod.rs
+22 -24
View File
@@ -110,7 +110,7 @@ where
// Accept all valid directives and print invalid ones
fn parse_user_directives(mut env_filter: EnvFilter, dirs: &str) -> Result<EnvFilter> {
for dir in dirs.split(',') {
env_filter = env_filter.add_directive(parse_default_directive(&dir)?);
env_filter = env_filter.add_directive(parse_default_directive(dir)?);
}
Ok(env_filter)
}
@@ -299,32 +299,30 @@ impl LoggerBuilder {
Ok(())
}
} else if self.log_reloading {
let subscriber = prepare_subscriber(
&self.directives,
None,
self.force_colors,
self.detailed_output,
|builder| enable_log_reloading!(builder),
)?;
tracing::subscriber::set_global_default(subscriber)?;
Ok(())
} else {
if self.log_reloading {
let subscriber = prepare_subscriber(
&self.directives,
None,
self.force_colors,
self.detailed_output,
|builder| enable_log_reloading!(builder),
)?;
let subscriber = prepare_subscriber(
&self.directives,
None,
self.force_colors,
self.detailed_output,
|builder| builder,
)?;
tracing::subscriber::set_global_default(subscriber)?;
tracing::subscriber::set_global_default(subscriber)?;
Ok(())
} else {
let subscriber = prepare_subscriber(
&self.directives,
None,
self.force_colors,
self.detailed_output,
|builder| builder,
)?;
tracing::subscriber::set_global_default(subscriber)?;
Ok(())
}
Ok(())
}
}
}