mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #11929 - flip1995:rustup, r=flip1995

Browse Source 
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.
This commit is contained in:
bors 2023-12-05 18:16:52 +00:00
commit 8851621498
14 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/clippy_bors.yml vendored
View File

@ -206,6 +206,7 @@ jobs:
max-parallel: 6
matrix:
integration:
- 'matthiaskrgr/clippy_ci_panic_test'
- 'rust-lang/cargo'
- 'rust-lang/chalk'
- 'rust-lang/rustfmt'
@ -220,7 +221,6 @@ jobs:
- 'rust-itertools/itertools'
- 'rust-lang-nursery/failure'
- 'rust-lang/log'
- 'matthiaskrgr/clippy_ci_panic_test'
runs-on: ubuntu-latest

2
rust-toolchain
View File

@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-12-01"
channel = "nightly-2023-12-05"
components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]

2
src/driver.rs
View File

@ -183,7 +183,7 @@ pub fn main() {
// as simple as moving the call from the hook to main, because `install_ice_hook` doesn't
// accept a generic closure.
let version_info = rustc_tools_util::get_version_info!();
handler.note_without_error(format!("Clippy version: {version_info}"));
handler.note(format!("Clippy version: {version_info}"));
});
exit(rustc_driver::catch_with_exit_code(move || {

8
tests/integration.rs
View File

@ -69,15 +69,15 @@ fn integration_test() {
// debug:
eprintln!("{stderr}");
// this is an internal test to make sure we would correctly panic on a delay_span_bug
// this is an internal test to make sure we would correctly panic on a span_delayed_bug
if repo_name == "matthiaskrgr/clippy_ci_panic_test" {
// we need to kind of switch around our logic here:
// if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing
// the repo basically just contains a delay_span_bug that forces rustc/clippy to panic:
// the repo basically just contains a span_delayed_bug that forces rustc/clippy to panic:
/*
#![feature(rustc_attrs)]
#[rustc_error(delay_span_bug_from_inside_query)]
#[rustc_error(span_delayed_bug_from_inside_query)]
fn main() {}
*/
@ -86,7 +86,7 @@ fn main() {}
return;
}
panic!("panic caused by delay_span_bug was NOT detected! Something is broken!");
panic!("panic caused by span_delayed_bug was NOT detected! Something is broken!");
}
if let Some(backtrace_start) = stderr.find("error: internal compiler error") {

2
tests/ui-cargo/module_style/fail_mod_remap/Cargo.stderr
View File

@ -8,4 +8,4 @@ error: `mod.rs` files are required, found `src/bad.rs`
= note: `-D clippy::self-named-module-files` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::self_named_module_files)]`
error: could not compile `fail-mod-remap` (bin "fail-mod-remap") due to previous error
error: could not compile `fail-mod-remap` (bin "fail-mod-remap") due to 1 previous error

2
tests/ui-cargo/module_style/fail_no_mod/Cargo.stderr
View File

@ -8,4 +8,4 @@ error: `mod.rs` files are not allowed, found `src/bad/mod.rs`
= note: `-D clippy::mod-module-files` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::mod_module_files)]`
error: could not compile `fail-no-mod` (bin "fail-no-mod") due to previous error
error: could not compile `fail-no-mod` (bin "fail-no-mod") due to 1 previous error

2
tests/ui-cargo/multiple_crate_versions/fail/Cargo.stderr
View File

@ -3,4 +3,4 @@ error: multiple versions for dependency `winapi`: 0.2.8, 0.3.9
= note: `-D clippy::multiple-crate-versions` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::multiple_crate_versions)]`
error: could not compile `multiple_crate_versions` (bin "multiple_crate_versions") due to previous error
error: could not compile `multiple_crate_versions` (bin "multiple_crate_versions") due to 1 previous error

2
tests/ui-cargo/wildcard_dependencies/fail/Cargo.stderr
View File

@ -3,4 +3,4 @@ error: wildcard dependency for `regex`
= note: `-D clippy::wildcard-dependencies` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::wildcard_dependencies)]`
error: could not compile `wildcard_dependencies` (bin "wildcard_dependencies") due to previous error
error: could not compile `wildcard_dependencies` (bin "wildcard_dependencies") due to 1 previous error

1
tests/ui/needless_raw_string.fixed
View File

@ -1,6 +1,5 @@
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
#![warn(clippy::needless_raw_strings)]
#![feature(c_str_literals)]
fn main() {
"aaa";

1
tests/ui/needless_raw_string.rs
View File

@ -1,6 +1,5 @@
#![allow(clippy::needless_raw_string_hashes, clippy::no_effect, unused)]
#![warn(clippy::needless_raw_strings)]
#![feature(c_str_literals)]
fn main() {
r#"aaa"#;

14
tests/ui/needless_raw_string.stderr
View File

@ -1,5 +1,5 @@
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:6:5
--> $DIR/needless_raw_string.rs:5:5
|
LL | r#"aaa"#;
| ^^^^^^^^
@ -13,7 +13,7 @@ LL + "aaa";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:9:5
--> $DIR/needless_raw_string.rs:8:5
|
LL | br#"aaa"#;
| ^^^^^^^^^
@ -25,7 +25,7 @@ LL + b"aaa";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:12:5
--> $DIR/needless_raw_string.rs:11:5
|
LL | cr#"aaa"#;
| ^^^^^^^^^
@ -37,7 +37,7 @@ LL + c"aaa";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:16:5
--> $DIR/needless_raw_string.rs:15:5
|
LL | / r#"
LL | | a
@ -56,7 +56,7 @@ LL ~ ";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:22:5
--> $DIR/needless_raw_string.rs:21:5
|
LL | r"no hashes";
| ^^^^^^^^^^^^
@ -68,7 +68,7 @@ LL + "no hashes";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:23:5
--> $DIR/needless_raw_string.rs:22:5
|
LL | br"no hashes";
| ^^^^^^^^^^^^^
@ -80,7 +80,7 @@ LL + b"no hashes";
|
error: unnecessary raw string literal
--> $DIR/needless_raw_string.rs:24:5
--> $DIR/needless_raw_string.rs:23:5
|
LL | cr"no hashes";
| ^^^^^^^^^^^^^

1
tests/ui/needless_raw_string_hashes.fixed
View File

@ -1,6 +1,5 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]
#![feature(c_str_literals)]
fn main() {
r"\aaa";

1
tests/ui/needless_raw_string_hashes.rs
View File

@ -1,6 +1,5 @@
#![allow(clippy::no_effect, unused)]
#![warn(clippy::needless_raw_string_hashes)]
#![feature(c_str_literals)]
fn main() {
r#"\aaa"#;

30
tests/ui/needless_raw_string_hashes.stderr
View File

@ -1,5 +1,5 @@
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:6:5
--> $DIR/needless_raw_string_hashes.rs:5:5
|
LL | r#"\aaa"#;
| ^^^^^^^^^
@ -13,7 +13,7 @@ LL + r"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:7:5
--> $DIR/needless_raw_string_hashes.rs:6:5
|
LL | r##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^
@ -25,7 +25,7 @@ LL + r#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:8:5
--> $DIR/needless_raw_string_hashes.rs:7:5
|
LL | r######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -37,7 +37,7 @@ LL + r####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:9:5
--> $DIR/needless_raw_string_hashes.rs:8:5
|
LL | r######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -49,7 +49,7 @@ LL + r###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:10:5
--> $DIR/needless_raw_string_hashes.rs:9:5
|
LL | br#"\aaa"#;
| ^^^^^^^^^^
@ -61,7 +61,7 @@ LL + br"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:11:5
--> $DIR/needless_raw_string_hashes.rs:10:5
|
LL | br##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^
@ -73,7 +73,7 @@ LL + br#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:12:5
--> $DIR/needless_raw_string_hashes.rs:11:5
|
LL | br######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -85,7 +85,7 @@ LL + br####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:13:5
--> $DIR/needless_raw_string_hashes.rs:12:5
|
LL | br######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -97,7 +97,7 @@ LL + br###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:14:5
--> $DIR/needless_raw_string_hashes.rs:13:5
|
LL | cr#"\aaa"#;
| ^^^^^^^^^^
@ -109,7 +109,7 @@ LL + cr"\aaa";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:15:5
--> $DIR/needless_raw_string_hashes.rs:14:5
|
LL | cr##"Hello "world"!"##;
| ^^^^^^^^^^^^^^^^^^^^^^
@ -121,7 +121,7 @@ LL + cr#"Hello "world"!"#;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:16:5
--> $DIR/needless_raw_string_hashes.rs:15:5
|
LL | cr######" "### "## "# "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -133,7 +133,7 @@ LL + cr####" "### "## "# "####;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:17:5
--> $DIR/needless_raw_string_hashes.rs:16:5
|
LL | cr######" "aa" "# "## "######;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -145,7 +145,7 @@ LL + cr###" "aa" "# "## "###;
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:19:5
--> $DIR/needless_raw_string_hashes.rs:18:5
|
LL | / r#"
LL | | \a
@ -164,7 +164,7 @@ LL ~ ";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:25:5
--> $DIR/needless_raw_string_hashes.rs:24:5
|
LL | r###"rust"###;
| ^^^^^^^^^^^^^
@ -176,7 +176,7 @@ LL + r"rust";
|
error: unnecessary hashes around raw string literal
--> $DIR/needless_raw_string_hashes.rs:26:5
--> $DIR/needless_raw_string_hashes.rs:25:5
|
LL | r#"hello world"#;
| ^^^^^^^^^^^^^^^^