Skip to content

Commit b914b9d

Browse files
committed
Remove the unstable snafu::display attribute
Turns out, this was never supposed to be supported in the first place. - rust-lang/rust#58899
1 parent 0229ec4 commit b914b9d

File tree

12 files changed

+3
-119
lines changed

12 files changed

+3
-119
lines changed

.cirrus.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ nightly_test_task:
3737
- cargo +nightly update -p backtrace-sys --precise 0.1.20
3838
- cargo +nightly update -p libc --precise 0.2.7
3939
- cargo +nightly test
40-
compatibility_test_script:
41-
- cd compatibility-tests/nightly/
42-
- rustc --version
43-
- cargo test
4440
before_cache_script: rm -rf $CARGO_HOME/registry/index
4541

4642
v1_30_test_task:

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,11 @@ backtraces = ["snafu-derive/backtraces", "backtrace"]
2828
# New methods on `Error`; re-export of proc-macro
2929
rust_1_30 = ["snafu-derive/rust_1_30"]
3030

31-
# The `snafu::display` attribute
32-
unstable_display_attribute = ["snafu-derive/unstable_display_attribute"]
33-
3431
[workspace]
3532
# The compatibility tests each set feature flags for the library and
3633
# cannot be in the same crate graph.
3734
exclude = [
3835
"compatibility-tests/compile-fail",
39-
"compatibility-tests/nightly",
4036
"compatibility-tests/v1_30",
4137
"compatibility-tests/v1_18",
4238
"compatibility-tests/without-backtrace",

compatibility-tests/compile-fail/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ edition = "2018"
66

77
[dependencies]
88
compiletest_rs = { version = "0.3.18", features = ["stable", "tmp"] }
9-
snafu = { path = "../..", features = ["unstable_display_attribute"] }
9+
snafu = { path = "../.." }

compatibility-tests/compile-fail/tests/compile-fail/error-reporting.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ enum TupleEnumVariant {
2323
//~^ ERROR Only struct-like and unit enum variants are supported
2424
}
2525

26-
#[derive(Snafu)]
27-
enum SnafuDisplayWrongKindOfExpression {
28-
#[snafu::display {}]
29-
//~^ ERROR A parenthesized format string with optional values is expected
30-
//~^^ expected one of `(` or `=`
31-
Alpha(i32),
32-
}
33-
3426
#[derive(Snafu)]
3527
enum OldSnafuDisplayWithoutArgument {
3628
#[snafu_display]

compatibility-tests/nightly/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

compatibility-tests/nightly/Cargo.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.

compatibility-tests/nightly/rust-toolchain

Lines changed: 0 additions & 1 deletion
This file was deleted.

compatibility-tests/nightly/src/lib.rs

Whitespace-only changes.

compatibility-tests/nightly/tests/unstable_attributes.rs

Lines changed: 0 additions & 40 deletions
This file was deleted.

snafu-derive/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ license = "MIT OR Apache-2.0"
1212
[features]
1313
backtraces = []
1414
rust_1_30 = []
15-
unstable_display_attribute = []
1615

1716
[lib]
1817
proc-macro = true

0 commit comments

Comments
 (0)