From cf3e659b9706e0b53ef5bdeb6770f2d9e4d8037c Mon Sep 17 00:00:00 2001 From: Bernhard Schuster Date: Thu, 4 Nov 2021 11:34:49 +0100 Subject: [PATCH 1/4] fix/warn: name is unused, only in debug would be used and but nobody does --- node/metered-channel/src/oneshot.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/node/metered-channel/src/oneshot.rs b/node/metered-channel/src/oneshot.rs index 5f2c72cb701e..af162c267f77 100644 --- a/node/metered-channel/src/oneshot.rs +++ b/node/metered-channel/src/oneshot.rs @@ -78,7 +78,7 @@ pub fn channel( let (tx, rx) = oneshot::channel(); ( - MeteredSender { name, inner: tx }, + MeteredSender { inner: tx }, MeteredReceiver { name, inner: rx, @@ -113,14 +113,13 @@ impl Measurable for Error { /// Oneshot sender, created by [`channel`]. #[derive(Debug)] pub struct MeteredSender { - name: &'static str, inner: oneshot::Sender<(Instant, T)>, } impl MeteredSender { /// Send a value. pub fn send(self, t: T) -> Result<(), T> { - let Self { inner, name: _ } = self; + let Self { inner } = self; inner.send((Instant::now(), t)).map_err(|(_, t)| t) } From a38b64864a256631444e0f8076a960bf29de38bf Mon Sep 17 00:00:00 2001 From: Bernhard Schuster Date: Thu, 4 Nov 2021 11:37:41 +0100 Subject: [PATCH 2/4] chore: Add better docs to `expansion` and why it exists --- node/overseer/overseer-gen/proc-macro/Cargo.toml | 2 +- node/overseer/overseer-gen/proc-macro/src/impl_channels_out.rs | 3 ++- node/overseer/overseer-gen/proc-macro/src/lib.rs | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/node/overseer/overseer-gen/proc-macro/Cargo.toml b/node/overseer/overseer-gen/proc-macro/Cargo.toml index 97ca4214760a..80140f455b17 100644 --- a/node/overseer/overseer-gen/proc-macro/Cargo.toml +++ b/node/overseer/overseer-gen/proc-macro/Cargo.toml @@ -23,5 +23,5 @@ assert_matches = "1.5.0" [features] default = [] # write the expanded version to a `overlord-expansion.rs` -# in the `cwd` +# in the `OUT_DIR` as defined by `cargo`. expansion = [] diff --git a/node/overseer/overseer-gen/proc-macro/src/impl_channels_out.rs b/node/overseer/overseer-gen/proc-macro/src/impl_channels_out.rs index bfe3150f551b..e2ec1752ce78 100644 --- a/node/overseer/overseer-gen/proc-macro/src/impl_channels_out.rs +++ b/node/overseer/overseer-gen/proc-macro/src/impl_channels_out.rs @@ -56,7 +56,8 @@ pub(crate) fn impl_channels_out_struct(info: &OverseerInfo) -> Result Date: Thu, 4 Nov 2021 11:45:57 +0100 Subject: [PATCH 3/4] chore: fmt --- node/network/availability-distribution/src/requester/mod.rs | 2 +- node/network/collator-protocol/src/validator_side/mod.rs | 2 +- node/network/statement-distribution/src/tests.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node/network/availability-distribution/src/requester/mod.rs b/node/network/availability-distribution/src/requester/mod.rs index f678a768d61f..53804aae8723 100644 --- a/node/network/availability-distribution/src/requester/mod.rs +++ b/node/network/availability-distribution/src/requester/mod.rs @@ -159,7 +159,7 @@ impl Requester { // Just book keeping - we are already requesting that chunk: { e.get_mut().add_leaf(leaf); - } + }, Entry::Vacant(e) => { let tx = self.tx.clone(); let metrics = self.metrics.clone(); diff --git a/node/network/collator-protocol/src/validator_side/mod.rs b/node/network/collator-protocol/src/validator_side/mod.rs index 0b050d3c5e19..9f018058ad22 100644 --- a/node/network/collator-protocol/src/validator_side/mod.rs +++ b/node/network/collator-protocol/src/validator_side/mod.rs @@ -1455,7 +1455,7 @@ async fn poll_collation_response( ); CollationFetchResult::Error(COST_WRONG_PARA) - } + }, Ok(CollationFetchingResponse::Collation(receipt, pov)) => { tracing::debug!( target: LOG_TARGET, diff --git a/node/network/statement-distribution/src/tests.rs b/node/network/statement-distribution/src/tests.rs index 2c41d5e7ddf0..80fdb50a4f26 100644 --- a/node/network/statement-distribution/src/tests.rs +++ b/node/network/statement-distribution/src/tests.rs @@ -1814,7 +1814,7 @@ fn peer_cant_flood_with_large_statements() { if p == peer_a && r == COST_APPARENT_FLOOD => { punished = true; - } + }, m => panic!("Unexpected message: {:?}", m), } From b5edafcbf3fdd924fd1b4ea3b6d867767a969c97 Mon Sep 17 00:00:00 2001 From: Bernhard Schuster Date: Thu, 4 Nov 2021 11:58:21 +0100 Subject: [PATCH 4/4] Revert "chore: fmt" This reverts commit 94d39bab5d1553d082a032ab6e31f579316dfa40. --- node/network/availability-distribution/src/requester/mod.rs | 2 +- node/network/collator-protocol/src/validator_side/mod.rs | 2 +- node/network/statement-distribution/src/tests.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/node/network/availability-distribution/src/requester/mod.rs b/node/network/availability-distribution/src/requester/mod.rs index 53804aae8723..f678a768d61f 100644 --- a/node/network/availability-distribution/src/requester/mod.rs +++ b/node/network/availability-distribution/src/requester/mod.rs @@ -159,7 +159,7 @@ impl Requester { // Just book keeping - we are already requesting that chunk: { e.get_mut().add_leaf(leaf); - }, + } Entry::Vacant(e) => { let tx = self.tx.clone(); let metrics = self.metrics.clone(); diff --git a/node/network/collator-protocol/src/validator_side/mod.rs b/node/network/collator-protocol/src/validator_side/mod.rs index 9f018058ad22..0b050d3c5e19 100644 --- a/node/network/collator-protocol/src/validator_side/mod.rs +++ b/node/network/collator-protocol/src/validator_side/mod.rs @@ -1455,7 +1455,7 @@ async fn poll_collation_response( ); CollationFetchResult::Error(COST_WRONG_PARA) - }, + } Ok(CollationFetchingResponse::Collation(receipt, pov)) => { tracing::debug!( target: LOG_TARGET, diff --git a/node/network/statement-distribution/src/tests.rs b/node/network/statement-distribution/src/tests.rs index 80fdb50a4f26..2c41d5e7ddf0 100644 --- a/node/network/statement-distribution/src/tests.rs +++ b/node/network/statement-distribution/src/tests.rs @@ -1814,7 +1814,7 @@ fn peer_cant_flood_with_large_statements() { if p == peer_a && r == COST_APPARENT_FLOOD => { punished = true; - }, + } m => panic!("Unexpected message: {:?}", m), }