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) } 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