From 1b298fe98174342931f31a94b2d50474d789d764 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 30 Aug 2022 18:33:27 -0700 Subject: [PATCH] Rename &mut Demand arguments to 'demand' --- build.rs | 4 ++-- src/context.rs | 10 +++++----- src/error.rs | 10 +++++----- src/wrapper.rs | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.rs b/build.rs index 78ea52c..7bfdca1 100644 --- a/build.rs +++ b/build.rs @@ -34,8 +34,8 @@ const PROBE: &str = r#" } impl Error for E { - fn provide<'a>(&'a self, req: &mut Demand<'a>) { - req.provide_ref(&self.backtrace); + fn provide<'a>(&'a self, demand: &mut Demand<'a>) { + demand.provide_ref(&self.backtrace); } } diff --git a/src/context.rs b/src/context.rs index c5c45c4..1b7dd31 100644 --- a/src/context.rs +++ b/src/context.rs @@ -128,8 +128,8 @@ where } #[cfg(backtrace)] - fn provide<'a>(&'a self, req: &mut Demand<'a>) { - self.error.provide(req); + fn provide<'a>(&'a self, demand: &mut Demand<'a>) { + self.error.provide(demand); } } @@ -142,9 +142,9 @@ where } #[cfg(backtrace)] - fn provide<'a>(&'a self, req: &mut Demand<'a>) { - req.provide_ref(self.error.backtrace()); - self.error.provide(req); + fn provide<'a>(&'a self, demand: &mut Demand<'a>) { + demand.provide_ref(self.error.backtrace()); + self.error.provide(demand); } } diff --git a/src/error.rs b/src/error.rs index 1c5e7c7..4256c77 100644 --- a/src/error.rs +++ b/src/error.rs @@ -896,11 +896,11 @@ impl ErrorImpl { } #[cfg(backtrace)] - unsafe fn provide<'a>(this: Ref<'a, Self>, req: &mut Demand<'a>) { + unsafe fn provide<'a>(this: Ref<'a, Self>, demand: &mut Demand<'a>) { if let Some(backtrace) = &this.deref().backtrace { - req.provide_ref(backtrace); + demand.provide_ref(backtrace); } - Self::error(this).provide(req); + Self::error(this).provide(demand); } #[cold] @@ -918,8 +918,8 @@ where } #[cfg(backtrace)] - fn provide<'a>(&'a self, req: &mut Demand<'a>) { - unsafe { ErrorImpl::provide(self.erase(), req) } + fn provide<'a>(&'a self, demand: &mut Demand<'a>) { + unsafe { ErrorImpl::provide(self.erase(), demand) } } } diff --git a/src/wrapper.rs b/src/wrapper.rs index 3a71a55..5f18a50 100644 --- a/src/wrapper.rs +++ b/src/wrapper.rs @@ -75,7 +75,7 @@ impl StdError for BoxedError { } #[cfg(backtrace)] - fn provide<'a>(&'a self, req: &mut Demand<'a>) { - self.0.provide(req); + fn provide<'a>(&'a self, demand: &mut Demand<'a>) { + self.0.provide(demand); } }