Skip to content

Commit 8851621

Browse files
borsbors
committed
Auto merge of #11929 - flip1995:rustup, r=flip1995
Rustup r? `@xFrednet` changelog: none out of cycle sync to fix integration test failure for the XFAIL integration test, as the `delayed_span_bug` attribute name was updated.
2 parents da27c97 + a7acfa2 commit 8851621

14 files changed

+33
-37
lines changed

‎.github/workflows/clippy_bors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ jobs:
206206
max-parallel: 6
207207
matrix:
208208
integration:
209+
- 'matthiaskrgr/clippy_ci_panic_test'
209210
- 'rust-lang/cargo'
210211
- 'rust-lang/chalk'
211212
- 'rust-lang/rustfmt'
@@ -220,7 +221,6 @@ jobs:
220221
- 'rust-itertools/itertools'
221222
- 'rust-lang-nursery/failure'
222223
- 'rust-lang/log'
223-
- 'matthiaskrgr/clippy_ci_panic_test'
224224

225225
runs-on: ubuntu-latest
226226

‎rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-12-01"
2+
channel = "nightly-2023-12-05"
33
components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]

‎src/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub fn main() {
183183
// as simple as moving the call from the hook to main, because `install_ice_hook` doesn't
184184
// accept a generic closure.
185185
let version_info = rustc_tools_util::get_version_info!();
186-
handler.note_without_error(format!("Clippy version: {version_info}"));
186+
handler.note(format!("Clippy version: {version_info}"));
187187
});
188188

189189
exit(rustc_driver::catch_with_exit_code(move || {

‎tests/integration.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ fn integration_test() {
6969
// debug:
7070
eprintln!("{stderr}");
7171

72-
// this is an internal test to make sure we would correctly panic on a delay_span_bug
72+
// this is an internal test to make sure we would correctly panic on a span_delayed_bug
7373
if repo_name == "matthiaskrgr/clippy_ci_panic_test" {
7474
// we need to kind of switch around our logic here:
7575
// if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing
7676

77-
// the repo basically just contains a delay_span_bug that forces rustc/clippy to panic:
77+
// the repo basically just contains a span_delayed_bug that forces rustc/clippy to panic:
7878
/*
7979
#![feature(rustc_attrs)]
80-
#[rustc_error(delay_span_bug_from_inside_query)]
80+
#[rustc_error(span_delayed_bug_from_inside_query)]
8181
fn main() {}
8282
*/
8383

@@ -86,7 +86,7 @@ fn integration_test() {
8686
return;
8787
}
8888

89-
panic!("panic caused by delay_span_bug was NOT detected! Something is broken!");
89+
panic!("panic caused by span_delayed_bug was NOT detected! Something is broken!");
9090
}
9191

9292
if let Some(backtrace_start) = stderr.find("error: internal compiler error") {

‎tests/ui-cargo/module_style/fail_mod_remap/Cargo.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ error: `mod.rs` files are required, found `src/bad.rs`
88
= note: `-D clippy::self-named-module-files` implied by `-D warnings`
99
= help: to override `-D warnings` add `#[allow(clippy::self_named_module_files)]`
1010

11-
error: could not compile `fail-mod-remap` (bin "fail-mod-remap") due to previous error
11+
error: could not compile `fail-mod-remap` (bin "fail-mod-remap") due to 1 previous error

‎tests/ui-cargo/module_style/fail_no_mod/Cargo.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ error: `mod.rs` files are not allowed, found `src/bad/mod.rs`
88
= note: `-D clippy::mod-module-files` implied by `-D warnings`
99
= help: to override `-D warnings` add `#[allow(clippy::mod_module_files)]`
1010

11-
error: could not compile `fail-no-mod` (bin "fail-no-mod") due to previous error
11+
error: could not compile `fail-no-mod` (bin "fail-no-mod") due to 1 previous error

‎tests/ui-cargo/multiple_crate_versions/fail/Cargo.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ error: multiple versions for dependency `winapi`: 0.2.8, 0.3.9
33
= note: `-D clippy::multiple-crate-versions` implied by `-D warnings`
44
= help: to override `-D warnings` add `#[allow(clippy::multiple_crate_versions)]`
55

6-
error: could not compile `multiple_crate_versions` (bin "multiple_crate_versions") due to previous error
6+
error: could not compile `multiple_crate_versions` (bin "multiple_crate_versions") due to 1 previous error

‎tests/ui-cargo/wildcard_dependencies/fail/Cargo.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ error: wildcard dependency for `regex`
33
= note: `-D clippy::wildcard-dependencies` implied by `-D warnings`
44
= help: to override `-D warnings` add `#[allow(clippy::wildcard_dependencies)]`
55

6-
error: could not compile `wildcard_dependencies` (bin "wildcard_dependencies") due to previous error
6+
error: could not compile `wildcard_dependencies` (bin "wildcard_dependencies") due to 1 previous error

‎tests/ui/needless_raw_string.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
22
#![warn(clippy::needless_raw_strings)]
3-
#![feature(c_str_literals)]
43

54
fn main() {
65
"aaa";

‎tests/ui/needless_raw_string.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
22
#![warn(clippy::needless_raw_strings)]
3-
#![feature(c_str_literals)]
43

54
fn main() {
65
r#"aaa"#;

‎tests/ui/needless_raw_string.stderr

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unnecessary raw string literal
2-
--> $DIR/needless_raw_string.rs:6:5
2+
--> $DIR/needless_raw_string.rs:5:5
33
|
44
LL | r#"aaa"#;
55
| ^^^^^^^^
@@ -13,7 +13,7 @@ LL + "aaa";
1313
|
1414

1515
error: unnecessary raw string literal
16-
--> $DIR/needless_raw_string.rs:9:5
16+
--> $DIR/needless_raw_string.rs:8:5
1717
|
1818
LL | br#"aaa"#;
1919
| ^^^^^^^^^
@@ -25,7 +25,7 @@ LL + b"aaa";
2525
|
2626

2727
error: unnecessary raw string literal
28-
--> $DIR/needless_raw_string.rs:12:5
28+
--> $DIR/needless_raw_string.rs:11:5
2929
|
3030
LL | cr#"aaa"#;
3131
| ^^^^^^^^^
@@ -37,7 +37,7 @@ LL + c"aaa";
3737
|
3838

3939
error: unnecessary raw string literal
40-
--> $DIR/needless_raw_string.rs:16:5
40+
--> $DIR/needless_raw_string.rs:15:5
4141
|
4242
LL | / r#"
4343
LL | | a
@@ -56,7 +56,7 @@ LL ~ ";
5656
|
5757

5858
error: unnecessary raw string literal
59-
--> $DIR/needless_raw_string.rs:22:5
59+
--> $DIR/needless_raw_string.rs:21:5
6060
|
6161
LL | r"no hashes";
6262
| ^^^^^^^^^^^^
@@ -68,7 +68,7 @@ LL + "no hashes";
6868
|
6969

7070
error: unnecessary raw string literal
71-
--> $DIR/needless_raw_string.rs:23:5
71+
--> $DIR/needless_raw_string.rs:22:5
7272
|
7373
LL | br"no hashes";
7474
| ^^^^^^^^^^^^^
@@ -80,7 +80,7 @@ LL + b"no hashes";
8080
|
8181

8282
error: unnecessary raw string literal
83-
--> $DIR/needless_raw_string.rs:24:5
83+
--> $DIR/needless_raw_string.rs:23:5
8484
|
8585
LL | cr"no hashes";
8686
| ^^^^^^^^^^^^^

‎tests/ui/needless_raw_string_hashes.fixed

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(clippy::no_effect, unused)]
22
#![warn(clippy::needless_raw_string_hashes)]
3-
#![feature(c_str_literals)]
43

54
fn main() {
65
r"\aaa";

‎tests/ui/needless_raw_string_hashes.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(clippy::no_effect, unused)]
22
#![warn(clippy::needless_raw_string_hashes)]
3-
#![feature(c_str_literals)]
43

54
fn main() {
65
r#"\aaa"#;

‎tests/ui/needless_raw_string_hashes.stderr

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unnecessary hashes around raw string literal
2-
--> $DIR/needless_raw_string_hashes.rs:6:5
2+
--> $DIR/needless_raw_string_hashes.rs:5:5
33
|
44
LL | r#"\aaa"#;
55
| ^^^^^^^^^
@@ -13,7 +13,7 @@ LL + r"\aaa";
1313
|
1414

1515
error: unnecessary hashes around raw string literal
16-
--> $DIR/needless_raw_string_hashes.rs:7:5
16+
--> $DIR/needless_raw_string_hashes.rs:6:5
1717
|
1818
LL | r##"Hello "world"!"##;
1919
| ^^^^^^^^^^^^^^^^^^^^^
@@ -25,7 +25,7 @@ LL + r#"Hello "world"!"#;
2525
|
2626

2727
error: unnecessary hashes around raw string literal
28-
--> $DIR/needless_raw_string_hashes.rs:8:5
28+
--> $DIR/needless_raw_string_hashes.rs:7:5
2929
|
3030
LL | r######" "### "## "# "######;
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -37,7 +37,7 @@ LL + r####" "### "## "# "####;
3737
|
3838

3939
error: unnecessary hashes around raw string literal
40-
--> $DIR/needless_raw_string_hashes.rs:9:5
40+
--> $DIR/needless_raw_string_hashes.rs:8:5
4141
|
4242
LL | r######" "aa" "# "## "######;
4343
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -49,7 +49,7 @@ LL + r###" "aa" "# "## "###;
4949
|
5050

5151
error: unnecessary hashes around raw string literal
52-
--> $DIR/needless_raw_string_hashes.rs:10:5
52+
--> $DIR/needless_raw_string_hashes.rs:9:5
5353
|
5454
LL | br#"\aaa"#;
5555
| ^^^^^^^^^^
@@ -61,7 +61,7 @@ LL + br"\aaa";
6161
|
6262

6363
error: unnecessary hashes around raw string literal
64-
--> $DIR/needless_raw_string_hashes.rs:11:5
64+
--> $DIR/needless_raw_string_hashes.rs:10:5
6565
|
6666
LL | br##"Hello "world"!"##;
6767
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -73,7 +73,7 @@ LL + br#"Hello "world"!"#;
7373
|
7474

7575
error: unnecessary hashes around raw string literal
76-
--> $DIR/needless_raw_string_hashes.rs:12:5
76+
--> $DIR/needless_raw_string_hashes.rs:11:5
7777
|
7878
LL | br######" "### "## "# "######;
7979
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -85,7 +85,7 @@ LL + br####" "### "## "# "####;
8585
|
8686

8787
error: unnecessary hashes around raw string literal
88-
--> $DIR/needless_raw_string_hashes.rs:13:5
88+
--> $DIR/needless_raw_string_hashes.rs:12:5
8989
|
9090
LL | br######" "aa" "# "## "######;
9191
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -97,7 +97,7 @@ LL + br###" "aa" "# "## "###;
9797
|
9898

9999
error: unnecessary hashes around raw string literal
100-
--> $DIR/needless_raw_string_hashes.rs:14:5
100+
--> $DIR/needless_raw_string_hashes.rs:13:5
101101
|
102102
LL | cr#"\aaa"#;
103103
| ^^^^^^^^^^
@@ -109,7 +109,7 @@ LL + cr"\aaa";
109109
|
110110

111111
error: unnecessary hashes around raw string literal
112-
--> $DIR/needless_raw_string_hashes.rs:15:5
112+
--> $DIR/needless_raw_string_hashes.rs:14:5
113113
|
114114
LL | cr##"Hello "world"!"##;
115115
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -121,7 +121,7 @@ LL + cr#"Hello "world"!"#;
121121
|
122122

123123
error: unnecessary hashes around raw string literal
124-
--> $DIR/needless_raw_string_hashes.rs:16:5
124+
--> $DIR/needless_raw_string_hashes.rs:15:5
125125
|
126126
LL | cr######" "### "## "# "######;
127127
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -133,7 +133,7 @@ LL + cr####" "### "## "# "####;
133133
|
134134

135135
error: unnecessary hashes around raw string literal
136-
--> $DIR/needless_raw_string_hashes.rs:17:5
136+
--> $DIR/needless_raw_string_hashes.rs:16:5
137137
|
138138
LL | cr######" "aa" "# "## "######;
139139
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -145,7 +145,7 @@ LL + cr###" "aa" "# "## "###;
145145
|
146146

147147
error: unnecessary hashes around raw string literal
148-
--> $DIR/needless_raw_string_hashes.rs:19:5
148+
--> $DIR/needless_raw_string_hashes.rs:18:5
149149
|
150150
LL | / r#"
151151
LL | | \a
@@ -164,7 +164,7 @@ LL ~ ";
164164
|
165165

166166
error: unnecessary hashes around raw string literal
167-
--> $DIR/needless_raw_string_hashes.rs:25:5
167+
--> $DIR/needless_raw_string_hashes.rs:24:5
168168
|
169169
LL | r###"rust"###;
170170
| ^^^^^^^^^^^^^
@@ -176,7 +176,7 @@ LL + r"rust";
176176
|
177177

178178
error: unnecessary hashes around raw string literal
179-
--> $DIR/needless_raw_string_hashes.rs:26:5
179+
--> $DIR/needless_raw_string_hashes.rs:25:5
180180
|
181181
LL | r#"hello world"#;
182182
| ^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)