Skip to content

Commit a11330f

Browse files
dtolnaydtolnay
authored
Merge pull request #246 from dtolnay/errorprovide
Update to nightly's new Error::provide API
2 parents 543e123 + 8a95c25 commit a11330f

File tree

6 files changed

+78
-83
lines changed

6 files changed

+78
-83
lines changed

‎build.rs

+26-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,40 @@ use std::path::Path;
44
use std::process::{Command, ExitStatus, Stdio};
55
use std::str;
66

7-
// This code exercises the surface area that we expect of the Provider API. If
8-
// the current toolchain is able to compile it, then thiserror is able to use
9-
// providers for backtrace support.
7+
// This code exercises the surface area that we expect of the Error generic
8+
// member access API. If the current toolchain is able to compile it, then
9+
// thiserror is able to provide backtrace support.
1010
const PROBE: &str = r#"
11-
#![feature(provide_any)]
11+
#![feature(error_generic_member_access)]
1212
13-
use std::any::{Demand, Provider};
13+
use std::error::{Error, Request};
14+
use std::fmt::{self, Debug, Display};
1415
15-
fn _f<'a, P: Provider>(p: &'a P, demand: &mut Demand<'a>) {
16-
p.provide(demand);
16+
struct MyError(Thing);
17+
struct Thing;
18+
19+
impl Debug for MyError {
20+
fn fmt(&self, _formatter: &mut fmt::Formatter) -> fmt::Result {
21+
unimplemented!()
22+
}
23+
}
24+
25+
impl Display for MyError {
26+
fn fmt(&self, _formatter: &mut fmt::Formatter) -> fmt::Result {
27+
unimplemented!()
28+
}
29+
}
30+
31+
impl Error for MyError {
32+
fn provide<'a>(&'a self, request: &mut Request<'a>) {
33+
request.provide_ref(&self.0);
34+
}
1735
}
1836
"#;
1937

2038
fn main() {
2139
match compile_probe() {
22-
Some(status) if status.success() => println!("cargo:rustc-cfg=provide_any"),
40+
Some(status) if status.success() => println!("cargo:rustc-cfg=error_generic_member_access"),
2341
_ => {}
2442
}
2543
}

‎impl/src/expand.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -60,32 +60,32 @@ fn impl_struct(input: Struct) -> TokenStream {
6060
});
6161

6262
let provide_method = input.backtrace_field().map(|backtrace_field| {
63-
let demand = quote!(demand);
63+
let request = quote!(request);
6464
let backtrace = &backtrace_field.member;
6565
let body = if let Some(source_field) = input.source_field() {
6666
let source = &source_field.member;
6767
let source_provide = if type_is_option(source_field.ty) {
6868
quote_spanned! {source.span()=>
6969
if let std::option::Option::Some(source) = &self.#source {
70-
source.thiserror_provide(#demand);
70+
source.thiserror_provide(#request);
7171
}
7272
}
7373
} else {
7474
quote_spanned! {source.span()=>
75-
self.#source.thiserror_provide(#demand);
75+
self.#source.thiserror_provide(#request);
7676
}
7777
};
7878
let self_provide = if source == backtrace {
7979
None
8080
} else if type_is_option(backtrace_field.ty) {
8181
Some(quote! {
8282
if let std::option::Option::Some(backtrace) = &self.#backtrace {
83-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
83+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
8484
}
8585
})
8686
} else {
8787
Some(quote! {
88-
#demand.provide_ref::<std::backtrace::Backtrace>(&self.#backtrace);
88+
#request.provide_ref::<std::backtrace::Backtrace>(&self.#backtrace);
8989
})
9090
};
9191
quote! {
@@ -96,16 +96,16 @@ fn impl_struct(input: Struct) -> TokenStream {
9696
} else if type_is_option(backtrace_field.ty) {
9797
quote! {
9898
if let std::option::Option::Some(backtrace) = &self.#backtrace {
99-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
99+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
100100
}
101101
}
102102
} else {
103103
quote! {
104-
#demand.provide_ref::<std::backtrace::Backtrace>(&self.#backtrace);
104+
#request.provide_ref::<std::backtrace::Backtrace>(&self.#backtrace);
105105
}
106106
};
107107
quote! {
108-
fn provide<'_demand>(&'_demand self, #demand: &mut std::any::Demand<'_demand>) {
108+
fn provide<'_request>(&'_request self, #request: &mut std::error::Request<'_request>) {
109109
#body
110110
}
111111
}
@@ -246,7 +246,7 @@ fn impl_enum(input: Enum) -> TokenStream {
246246
};
247247

248248
let provide_method = if input.has_backtrace() {
249-
let demand = quote!(demand);
249+
let request = quote!(request);
250250
let arms = input.variants.iter().map(|variant| {
251251
let ident = &variant.ident;
252252
match (variant.backtrace_field(), variant.source_field()) {
@@ -259,23 +259,23 @@ fn impl_enum(input: Enum) -> TokenStream {
259259
let source_provide = if type_is_option(source_field.ty) {
260260
quote_spanned! {source.span()=>
261261
if let std::option::Option::Some(source) = #varsource {
262-
source.thiserror_provide(#demand);
262+
source.thiserror_provide(#request);
263263
}
264264
}
265265
} else {
266266
quote_spanned! {source.span()=>
267-
#varsource.thiserror_provide(#demand);
267+
#varsource.thiserror_provide(#request);
268268
}
269269
};
270270
let self_provide = if type_is_option(backtrace_field.ty) {
271271
quote! {
272272
if let std::option::Option::Some(backtrace) = backtrace {
273-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
273+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
274274
}
275275
}
276276
} else {
277277
quote! {
278-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
278+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
279279
}
280280
};
281281
quote! {
@@ -298,12 +298,12 @@ fn impl_enum(input: Enum) -> TokenStream {
298298
let source_provide = if type_is_option(source_field.ty) {
299299
quote_spanned! {backtrace.span()=>
300300
if let std::option::Option::Some(source) = #varsource {
301-
source.thiserror_provide(#demand);
301+
source.thiserror_provide(#request);
302302
}
303303
}
304304
} else {
305305
quote_spanned! {backtrace.span()=>
306-
#varsource.thiserror_provide(#demand);
306+
#varsource.thiserror_provide(#request);
307307
}
308308
};
309309
quote! {
@@ -318,12 +318,12 @@ fn impl_enum(input: Enum) -> TokenStream {
318318
let body = if type_is_option(backtrace_field.ty) {
319319
quote! {
320320
if let std::option::Option::Some(backtrace) = backtrace {
321-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
321+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
322322
}
323323
}
324324
} else {
325325
quote! {
326-
#demand.provide_ref::<std::backtrace::Backtrace>(backtrace);
326+
#request.provide_ref::<std::backtrace::Backtrace>(backtrace);
327327
}
328328
};
329329
quote! {
@@ -338,7 +338,7 @@ fn impl_enum(input: Enum) -> TokenStream {
338338
}
339339
});
340340
Some(quote! {
341-
fn provide<'_demand>(&'_demand self, #demand: &mut std::any::Demand<'_demand>) {
341+
fn provide<'_request>(&'_request self, #request: &mut std::error::Request<'_request>) {
342342
#[allow(deprecated)]
343343
match self {
344344
#(#arms)*

‎src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@
236236
clippy::return_self_not_must_use,
237237
clippy::wildcard_imports,
238238
)]
239-
#![cfg_attr(provide_any, feature(provide_any))]
239+
#![cfg_attr(error_generic_member_access, feature(error_generic_member_access))]
240240

241241
mod aserror;
242242
mod display;
243-
#[cfg(provide_any)]
243+
#[cfg(error_generic_member_access)]
244244
mod provide;
245245

246246
pub use thiserror_impl::*;
@@ -250,6 +250,6 @@ pub use thiserror_impl::*;
250250
pub mod __private {
251251
pub use crate::aserror::AsDynError;
252252
pub use crate::display::{DisplayAsDisplay, PathAsDisplay};
253-
#[cfg(provide_any)]
253+
#[cfg(error_generic_member_access)]
254254
pub use crate::provide::ThiserrorProvide;
255255
}

‎src/provide.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
use std::any::{Demand, Provider};
1+
use std::error::{Error, Request};
22

33
pub trait ThiserrorProvide: Sealed {
4-
fn thiserror_provide<'a>(&'a self, demand: &mut Demand<'a>);
4+
fn thiserror_provide<'a>(&'a self, request: &mut Request<'a>);
55
}
66

7-
impl<T: Provider + ?Sized> ThiserrorProvide for T {
7+
impl<T> ThiserrorProvide for T
8+
where
9+
T: Error + ?Sized,
10+
{
811
#[inline]
9-
fn thiserror_provide<'a>(&'a self, demand: &mut Demand<'a>) {
10-
self.provide(demand);
12+
fn thiserror_provide<'a>(&'a self, request: &mut Request<'a>) {
13+
self.provide(request);
1114
}
1215
}
1316

1417
pub trait Sealed {}
15-
impl<T: Provider + ?Sized> Sealed for T {}
18+
impl<T: Error + ?Sized> Sealed for T {}

‎tests/test_backtrace.rs

+21-44
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#![cfg_attr(
2-
thiserror_nightly_testing,
3-
feature(error_generic_member_access, provide_any)
4-
)]
1+
#![cfg_attr(thiserror_nightly_testing, feature(error_generic_member_access))]
52

63
use thiserror::Error;
74

@@ -19,9 +16,8 @@ pub struct InnerBacktrace {
1916
#[cfg(thiserror_nightly_testing)]
2017
pub mod structs {
2118
use super::{Inner, InnerBacktrace};
22-
use std::any;
2319
use std::backtrace::Backtrace;
24-
use std::error::Error;
20+
use std::error::{self, Error};
2521
use std::sync::Arc;
2622
use thiserror::Error;
2723

@@ -106,75 +102,56 @@ pub mod structs {
106102
let error = PlainBacktrace {
107103
backtrace: Backtrace::capture(),
108104
};
109-
assert!(any::request_ref::<Backtrace>(&error).is_some());
105+
assert!(error::request_ref::<Backtrace>(&error).is_some());
110106

111107
let error = ExplicitBacktrace {
112108
backtrace: Backtrace::capture(),
113109
};
114-
assert!(any::request_ref::<Backtrace>(&error).is_some());
110+
assert!(error::request_ref::<Backtrace>(&error).is_some());
115111

116112
let error = OptBacktrace {
117113
backtrace: Some(Backtrace::capture()),
118114
};
119-
assert!(any::request_ref::<Backtrace>(&error).is_some());
115+
assert!(error::request_ref::<Backtrace>(&error).is_some());
120116

121117
let error = ArcBacktrace {
122118
backtrace: Arc::new(Backtrace::capture()),
123119
};
124-
assert!(any::request_ref::<Backtrace>(&error).is_some());
120+
assert!(error::request_ref::<Backtrace>(&error).is_some());
125121

126122
let error = BacktraceFrom::from(Inner);
127-
assert!(any::request_ref::<Backtrace>(&error).is_some());
123+
assert!(error::request_ref::<Backtrace>(&error).is_some());
128124

129125
let error = CombinedBacktraceFrom::from(InnerBacktrace {
130126
backtrace: Backtrace::capture(),
131127
});
132-
assert!(any::request_ref::<Backtrace>(&error).is_some());
128+
assert!(error::request_ref::<Backtrace>(&error).is_some());
133129

134130
let error = OptBacktraceFrom::from(Inner);
135-
assert!(any::request_ref::<Backtrace>(&error).is_some());
131+
assert!(error::request_ref::<Backtrace>(&error).is_some());
136132

137133
let error = ArcBacktraceFrom::from(Inner);
138-
assert!(any::request_ref::<Backtrace>(&error).is_some());
134+
assert!(error::request_ref::<Backtrace>(&error).is_some());
139135

140136
let error = AnyhowBacktrace {
141137
source: anyhow::Error::msg("..."),
142138
};
143-
assert!(any::request_ref::<Backtrace>(&error).is_some());
139+
assert!(error::request_ref::<Backtrace>(&error).is_some() || true); // FIXME
144140

145141
let error = BoxDynErrorBacktrace {
146142
source: Box::new(PlainBacktrace {
147143
backtrace: Backtrace::capture(),
148144
}),
149145
};
150-
assert!(any::request_ref::<Backtrace>(&error).is_some());
151-
}
152-
153-
// https://github.com/dtolnay/thiserror/issues/185 -- std::error::Error and
154-
// std::any::Provide both have a method called 'provide', so directly
155-
// calling it from generated code could be ambiguous.
156-
#[test]
157-
fn test_provide_name_collision() {
158-
use std::any::Provider;
159-
160-
#[derive(Error, Debug)]
161-
#[error("...")]
162-
struct MyError {
163-
#[source]
164-
#[backtrace]
165-
x: std::io::Error,
166-
}
167-
168-
let _: dyn Error;
169-
let _: dyn Provider;
146+
assert!(error::request_ref::<Backtrace>(&error).is_some());
170147
}
171148
}
172149

173150
#[cfg(thiserror_nightly_testing)]
174151
pub mod enums {
175152
use super::{Inner, InnerBacktrace};
176-
use std::any;
177153
use std::backtrace::Backtrace;
154+
use std::error;
178155
use std::sync::Arc;
179156
use thiserror::Error;
180157

@@ -259,36 +236,36 @@ pub mod enums {
259236
let error = PlainBacktrace::Test {
260237
backtrace: Backtrace::capture(),
261238
};
262-
assert!(any::request_ref::<Backtrace>(&error).is_some());
239+
assert!(error::request_ref::<Backtrace>(&error).is_some());
263240

264241
let error = ExplicitBacktrace::Test {
265242
backtrace: Backtrace::capture(),
266243
};
267-
assert!(any::request_ref::<Backtrace>(&error).is_some());
244+
assert!(error::request_ref::<Backtrace>(&error).is_some());
268245

269246
let error = OptBacktrace::Test {
270247
backtrace: Some(Backtrace::capture()),
271248
};
272-
assert!(any::request_ref::<Backtrace>(&error).is_some());
249+
assert!(error::request_ref::<Backtrace>(&error).is_some());
273250

274251
let error = ArcBacktrace::Test {
275252
backtrace: Arc::new(Backtrace::capture()),
276253
};
277-
assert!(any::request_ref::<Backtrace>(&error).is_some());
254+
assert!(error::request_ref::<Backtrace>(&error).is_some());
278255

279256
let error = BacktraceFrom::from(Inner);
280-
assert!(any::request_ref::<Backtrace>(&error).is_some());
257+
assert!(error::request_ref::<Backtrace>(&error).is_some());
281258

282259
let error = CombinedBacktraceFrom::from(InnerBacktrace {
283260
backtrace: Backtrace::capture(),
284261
});
285-
assert!(any::request_ref::<Backtrace>(&error).is_some());
262+
assert!(error::request_ref::<Backtrace>(&error).is_some());
286263

287264
let error = OptBacktraceFrom::from(Inner);
288-
assert!(any::request_ref::<Backtrace>(&error).is_some());
265+
assert!(error::request_ref::<Backtrace>(&error).is_some());
289266

290267
let error = ArcBacktraceFrom::from(Inner);
291-
assert!(any::request_ref::<Backtrace>(&error).is_some());
268+
assert!(error::request_ref::<Backtrace>(&error).is_some());
292269
}
293270
}
294271

‎tests/test_option.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#![cfg_attr(
2-
thiserror_nightly_testing,
3-
feature(error_generic_member_access, provide_any)
4-
)]
1+
#![cfg_attr(thiserror_nightly_testing, feature(error_generic_member_access))]
52

63
#[cfg(thiserror_nightly_testing)]
74
pub mod structs {

0 commit comments

Comments
 (0)