Skip to content

Commit 82a5595

Browse files
committed
Fix test breakage due to rust-lang/rust#76898
See rust-lang/rust#76898
1 parent 64cb703 commit 82a5595

File tree

7 files changed

+34
-73
lines changed

7 files changed

+34
-73
lines changed

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-09-15
1+
nightly-2020-09-25

tests/cases/bounds/stdout

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ error: breaking changes in `abc`
2323
--> bounds/new.rs:9:1
2424
|
2525
9 | pub fn abc<A: Clone>(_: A) {}
26-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
26+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2727
|
2828
= warning: added bound: `A: std::clone::Clone` (breaking)
2929

3030
warning: technically breaking changes in `def`
3131
--> bounds/new.rs:11:1
3232
|
3333
11 | pub fn def<A>(_: A) {}
34-
| ^^^^^^^^^^^^^^^^^^^^^^
34+
| ^^^^^^^^^^^^^^^^^^^
3535
|
3636
= note: removed bound: `A: std::clone::Clone` (technically breaking)
3737

38-
error: aborting due to 2 previous errors; 2 warnings emitted
39-
38+
error: aborting due to 2 previous errors; 2 warnings emitted

tests/cases/func/stdout

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,77 +3,64 @@ error: breaking changes in `bcd`
33
--> func/new.rs:4:1
44
|
55
4 | pub fn bcd(_: u8) {}
6-
| ^^^^^^^^^^^^^^^^^^^^
6+
| ^^^^^^^^^^^^^^^^^
77
|
88
= warning: type error: incorrect number of function parameters (breaking)
99

1010
error: breaking changes in `cde`
1111
--> func/new.rs:6:1
1212
|
13-
6 | / pub fn cde() -> u16 {
14-
7 | | 0xcde
15-
8 | | }
16-
| |_^
13+
6 | pub fn cde() -> u16 {
14+
| ^^^^^^^^^^^^^^^^^^^
1715
|
1816
= warning: type error: expected `()`, found `u16` (breaking)
1917

2018
error: breaking changes in `def`
2119
--> func/new.rs:10:1
2220
|
2321
10 | pub fn def() {}
24-
| ^^^^^^^^^^^^^^^
22+
| ^^^^^^^^^^^^
2523
|
2624
= warning: type error: incorrect number of function parameters (breaking)
2725

2826
warning: non-breaking changes in `efg`
2927
--> func/new.rs:12:1
3028
|
31-
12 | / pub fn efg<A>(a: A, _: A) -> A {
32-
13 | | a
33-
14 | | }
34-
| |_^
29+
12 | pub fn efg<A>(a: A, _: A) -> A {
30+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3531
|
3632
= note: defaulted type parameter added (non-breaking)
3733

3834
error: breaking changes in `fgh`
3935
--> func/new.rs:16:1
4036
|
41-
16 | / pub fn fgh(a: u8, _: u16) -> u8 {
42-
17 | | a
43-
18 | | }
44-
| |_^
37+
16 | pub fn fgh(a: u8, _: u16) -> u8 {
38+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4539
|
4640
= warning: type error: expected `u8`, found `u16` (breaking)
4741

4842
error: breaking changes in `ghi`
4943
--> func/new.rs:20:1
5044
|
51-
20 | / pub fn ghi(a: u8, _: u8) -> u16 {
52-
21 | | a as u16
53-
22 | | }
54-
| |_^
45+
20 | pub fn ghi(a: u8, _: u8) -> u16 {
46+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5547
|
5648
= warning: type error: expected `u8`, found `u16` (breaking)
5749

5850
warning: non-breaking changes in `hij`
5951
--> func/new.rs:24:1
6052
|
61-
24 | / pub const fn hij() -> u8 {
62-
25 | | 0
63-
26 | | }
64-
| |_^
53+
24 | pub const fn hij() -> u8 {
54+
| ^^^^^^^^^^^^^^^^^^^^^^^^
6555
|
6656
= note: fn item made const (non-breaking)
6757

6858
error: breaking changes in `ijk`
6959
--> func/new.rs:28:1
7060
|
71-
28 | / pub fn ijk() -> u8 {
72-
29 | | 0
73-
30 | | }
74-
| |_^
61+
28 | pub fn ijk() -> u8 {
62+
| ^^^^^^^^^^^^^^^^^^
7563
|
7664
= warning: fn item made non-const (breaking)
7765

78-
error: aborting due to 6 previous errors; 2 warnings emitted
79-
66+
error: aborting due to 6 previous errors; 2 warnings emitted

tests/cases/infer_regress/stdout

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ error: breaking changes in `abc`
33
--> infer_regress/new.rs:1:1
44
|
55
1 | pub fn abc<A>(_: A) { }
6-
| ^^^^^^^^^^^^^^^^^^^^^^^
6+
| ^^^^^^^^^^^^^^^^^^^
77
|
88
= note: variance loosened (non-breaking)
99
= warning: type error: expected type parameter `A`, found `()` (breaking)
@@ -16,5 +16,4 @@ error: breaking changes in `Abc`
1616
|
1717
= warning: type error: expected type parameter `A`, found `()` (breaking)
1818

19-
error: aborting due to 2 previous errors
20-
19+
error: aborting due to 2 previous errors

tests/cases/regions/stdout

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,32 @@ error: breaking changes in `abc`
1919
--> regions/new.rs:13:1
2020
|
2121
13 | pub fn abc(_: &bool) { }
22-
| ^^^^^^^^^^^^^^^^^^^^^^^^
22+
| ^^^^^^^^^^^^^^^^^^^^
2323
|
2424
= warning: type error: expected `bool`, found `&bool` (breaking)
2525

2626
error: breaking changes in `def`
2727
--> regions/new.rs:15:1
2828
|
2929
15 | pub fn def(_: bool) { }
30-
| ^^^^^^^^^^^^^^^^^^^^^^^
30+
| ^^^^^^^^^^^^^^^^^^^
3131
|
3232
= warning: type error: expected `&bool`, found `bool` (breaking)
3333

3434
error: breaking changes in `efg`
3535
--> regions/new.rs:17:1
3636
|
3737
17 | pub fn efg(_: &str) { }
38-
| ^^^^^^^^^^^^^^^^^^^^^^^
38+
| ^^^^^^^^^^^^^^^^^^^
3939
|
4040
= warning: type error: expected bound lifetime parameter, found concrete lifetime (breaking)
4141

4242
error: breaking changes in `fgh`
4343
--> regions/new.rs:19:1
4444
|
4545
19 | pub fn fgh(_: &'static str) { }
46-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
46+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
4747
|
4848
= warning: type error: expected bound lifetime parameter, found concrete lifetime (breaking)
4949

50-
error: aborting due to 6 previous errors
51-
50+
error: aborting due to 6 previous errors

tests/full_cases/log-0.3.4-0.3.8.linux

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -130,36 +130,23 @@ warning: path changes to `set_logger_raw`
130130
|
131131
713 | / pub unsafe fn set_logger_raw<M>(make_logger: M) -> Result<(), SetLoggerError>
132132
714 | | where M: FnOnce(MaxLogLevelFilter) -> *const Log {
133-
715 | | if STATE.compare_and_swap(UNINITIALIZED, INITIALIZING,
134-
716 | | Ordering::SeqCst) != UNINITIALIZED {
135-
... |
136-
722 | | Ok(())
137-
723 | | }
138-
| |_^
133+
| |________________________________________________________^
139134
|
140135
= note: added definition (technically breaking)
141136

142137
warning: path changes to `shutdown_logger`
143138
--> log-0.3.8/src/lib.rs:736:1
144139
|
145-
736 | / pub fn shutdown_logger() -> Result<Box<Log>, ShutdownLoggerError> {
146-
737 | | shutdown_logger_raw().map(|l| unsafe { mem::transmute(l) })
147-
738 | | }
148-
| |_^
140+
736 | pub fn shutdown_logger() -> Result<Box<Log>, ShutdownLoggerError> {
141+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
149142
|
150143
= note: added definition (technically breaking)
151144

152145
warning: path changes to `shutdown_logger_raw`
153146
--> log-0.3.8/src/lib.rs:754:1
154147
|
155-
754 | / pub fn shutdown_logger_raw() -> Result<*const Log, ShutdownLoggerError> {
156-
755 | | // Set the global log level to stop other thread from logging
157-
756 | | MAX_LOG_LEVEL_FILTER.store(0, Ordering::SeqCst);
158-
757 | |
159-
... |
160-
772 | | }
161-
773 | | }
162-
| |_^
148+
754 | pub fn shutdown_logger_raw() -> Result<*const Log, ShutdownLoggerError> {
149+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
163150
|
164151
= note: added definition (technically breaking)
165152

tests/full_cases/rmpv-0.4.0-0.4.1.linux

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ error: breaking changes in `write_value`
3030
|
3131
15 | / pub fn write_value<W>(wr: &mut W, val: &Value) -> Result<(), Error>
3232
16 | | where W: Write
33-
17 | | {
34-
18 | | match *val {
35-
... |
36-
69 | | Ok(())
37-
70 | | }
38-
| |_^
33+
| |__________________^
3934
|
4035
= warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking)
4136

@@ -44,12 +39,7 @@ error: breaking changes in `write_value_ref`
4439
|
4540
27 | / pub fn write_value_ref<W>(wr: &mut W, val: &ValueRef) -> Result<(), Error>
4641
28 | | where W: Write
47-
29 | | {
48-
30 | | match *val {
49-
... |
50-
81 | | Ok(())
51-
82 | | }
52-
| |_^
42+
| |__________________^
5343
|
5444
= warning: type error: expected enum `old::encode::Error`, found enum `new::encode::Error` (breaking)
5545

@@ -108,4 +98,4 @@ warning: technically breaking changes in `<new::decode::Error as std::convert::F
10898

10999
error: aborting due to 4 previous errors; 4 warnings emitted
110100

111-
error: rustc-semverver errored
101+
error: rustc-semverver errored

0 commit comments

Comments
 (0)