Skip to content

Commit b556a5b

Browse files
committed
error::Error: rename the Demand arguments from req to demand
Signed-off-by: Nick Cameron <[email protected]>
1 parent 80442f3 commit b556a5b

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

library/core/src/error.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ pub trait Error: Debug + Display {
182182
/// }
183183
///
184184
/// impl std::error::Error for Error {
185-
/// fn provide<'a>(&'a self, req: &mut Demand<'a>) {
186-
/// req
185+
/// fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
186+
/// demand
187187
/// .provide_ref::<MyBacktrace>(&self.backtrace)
188188
/// .provide_ref::<dyn std::error::Error + 'static>(&self.source);
189189
/// }
@@ -201,16 +201,16 @@ pub trait Error: Debug + Display {
201201
/// ```
202202
#[unstable(feature = "error_generic_member_access", issue = "99301")]
203203
#[allow(unused_variables)]
204-
fn provide<'a>(&'a self, req: &mut Demand<'a>) {}
204+
fn provide<'a>(&'a self, demand: &mut Demand<'a>) {}
205205
}
206206

207207
#[unstable(feature = "error_generic_member_access", issue = "99301")]
208208
impl<E> Provider for E
209209
where
210210
E: Error + ?Sized,
211211
{
212-
fn provide<'a>(&'a self, req: &mut Demand<'a>) {
213-
self.provide(req)
212+
fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
213+
self.provide(demand)
214214
}
215215
}
216216

@@ -463,8 +463,8 @@ impl<'a, T: Error + ?Sized> Error for &'a T {
463463
Error::source(&**self)
464464
}
465465

466-
fn provide<'b>(&'b self, req: &mut Demand<'b>) {
467-
Error::provide(&**self, req);
466+
fn provide<'b>(&'b self, demand: &mut Demand<'b>) {
467+
Error::provide(&**self, demand);
468468
}
469469
}
470470

library/std/src/error.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ pub trait Error: Debug + Display {
221221
/// }
222222
///
223223
/// impl std::error::Error for Error {
224-
/// fn provide<'a>(&'a self, req: &mut Demand<'a>) {
225-
/// req
224+
/// fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
225+
/// demand
226226
/// .provide_ref::<MyBacktrace>(&self.backtrace)
227227
/// .provide_ref::<dyn std::error::Error + 'static>(&self.source);
228228
/// }
@@ -240,14 +240,14 @@ pub trait Error: Debug + Display {
240240
/// ```
241241
#[unstable(feature = "error_generic_member_access", issue = "99301")]
242242
#[allow(unused_variables)]
243-
fn provide<'a>(&'a self, req: &mut Demand<'a>) {}
243+
fn provide<'a>(&'a self, demand: &mut Demand<'a>) {}
244244
}
245245

246246
#[cfg(bootstrap)]
247247
#[unstable(feature = "error_generic_member_access", issue = "99301")]
248248
impl<'b> Provider for dyn Error + 'b {
249-
fn provide<'a>(&'a self, req: &mut Demand<'a>) {
250-
self.provide(req)
249+
fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
250+
self.provide(demand)
251251
}
252252
}
253253

@@ -659,8 +659,8 @@ impl<'a, T: Error + ?Sized> Error for &'a T {
659659
Error::source(&**self)
660660
}
661661

662-
fn provide<'b>(&'b self, req: &mut Demand<'b>) {
663-
Error::provide(&**self, req);
662+
fn provide<'b>(&'b self, demand: &mut Demand<'b>) {
663+
Error::provide(&**self, demand);
664664
}
665665
}
666666

@@ -681,8 +681,8 @@ impl<T: Error + ?Sized> Error for Arc<T> {
681681
Error::source(&**self)
682682
}
683683

684-
fn provide<'a>(&'a self, req: &mut Demand<'a>) {
685-
Error::provide(&**self, req);
684+
fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
685+
Error::provide(&**self, demand);
686686
}
687687
}
688688

@@ -1442,9 +1442,8 @@ impl<E> Report<E> {
14421442
/// }
14431443
///
14441444
/// impl Error for SuperErrorSideKick {
1445-
/// fn provide<'a>(&'a self, req: &mut Demand<'a>) {
1446-
/// req
1447-
/// .provide_ref::<Backtrace>(&self.backtrace);
1445+
/// fn provide<'a>(&'a self, demand: &mut Demand<'a>) {
1446+
/// demand.provide_ref::<Backtrace>(&self.backtrace);
14481447
/// }
14491448
/// }
14501449
///

0 commit comments

Comments
 (0)