user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clippy: make tests work in stage 1

Browse source
This commit is contained in:
Ralf Jung 2025-07-16 16:25:29 +02:00
parent f4b827abeb
commit 50f36c0d34
13 changed files with 64 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
clippy_test_deps/Cargo.lock generated
View file

@ -72,6 +72,7 @@ dependencies = [
"futures",
"if_chain",
"itertools",
"libc",
"parking_lot",
"quote",
"regex",

1
clippy_test_deps/Cargo.toml
View file

@ -6,6 +6,7 @@ edition = "2021"
# Add dependencies here to make them available in ui tests.
[dependencies]
libc = "0.2"
regex = "1.5.5"
serde = { version = "1.0.145", features = ["derive"] }
if_chain = "1.0"

29
tests/compile-test.rs
View file

@ -151,7 +151,31 @@ impl TestContext {
defaults.set_custom(
"dependencies",
DependencyBuilder {
program: CommandBuilder::cargo(),
program: {
let mut p = CommandBuilder::cargo();
// If we run in bootstrap, we need to use the right compiler for building the
// tests -- not the compiler that built clippy, but the compiler that got linked
// into clippy. Just invoking TEST_RUSTC does not work because LD_LIBRARY_PATH
// is set in a way that makes it pick the wrong sysroot. Sadly due to
// <https://github.com/rust-lang/cargo/issues/4423> we cannot use RUSTFLAGS to
// set `--sysroot`, so we need to use bootstrap's rustc wrapper. That wrapper
// however has some staging logic that is hurting us here, so to work around
// that we set both the "real" and "staging" rustc to TEST_RUSTC, including the
// associated library paths.
if let Some(rustc) = option_env!("TEST_RUSTC") {
let libdir = option_env!("TEST_RUSTC_LIB").unwrap();
let sysroot = option_env!("TEST_SYSROOT").unwrap();
p.envs.push(("RUSTC_REAL".into(), Some(rustc.into())));
p.envs.push(("RUSTC_REAL_LIBDIR".into(), Some(libdir.into())));
p.envs.push(("RUSTC_SNAPSHOT".into(), Some(rustc.into())));
p.envs.push(("RUSTC_SNAPSHOT_LIBDIR".into(), Some(libdir.into())));
p.envs.push((
"RUSTC_SYSROOT".into(),
Some(sysroot.into()),
));
}
p
},
crate_manifest_path: Path::new("clippy_test_deps").join("Cargo.toml"),
build_std: None,
bless_lockfile: self.args.bless,
@ -192,6 +216,9 @@ impl TestContext {
let dep = format!("-Ldependency={}", Path::new(host_libs).join("deps").display());
config.program.args.push(dep.into());
}
if let Some(sysroot) = option_env!("TEST_SYSROOT") {
config.program.args.push(format!("--sysroot={sysroot}").into());
}
config.program.program = profile_path.join(if cfg!(windows) {
"clippy-driver.exe"

2
tests/ui/auxiliary/proc_macro_derive.rs
View file

@ -16,7 +16,7 @@ pub fn derive(_: TokenStream) -> TokenStream {
let output = quote! {
// Should not trigger `useless_attribute`
#[allow(dead_code)]
extern crate rustc_middle;
extern crate core;
};
output
}

3
tests/ui/cast_alignment.rs
View file

@ -1,6 +1,5 @@
//! Test casts for alignment issues
#![feature(rustc_private)]
#![feature(core_intrinsics)]
#![warn(clippy::cast_ptr_alignment)]
#![allow(
@ -10,8 +9,6 @@
clippy::borrow_as_ptr
)]
extern crate libc;
fn main() {
/* These should be warned against */

8
tests/ui/cast_alignment.stderr
View file

@ -1,5 +1,5 @@
error: casting from `*const u8` to a more-strictly-aligned pointer (`*const u16`) (1 < 2 bytes)
--> tests/ui/cast_alignment.rs:19:5
--> tests/ui/cast_alignment.rs:16:5
|
LL | (&1u8 as *const u8) as *const u16;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -8,19 +8,19 @@ LL | (&1u8 as *const u8) as *const u16;
= help: to override `-D warnings` add `#[allow(clippy::cast_ptr_alignment)]`
error: casting from `*mut u8` to a more-strictly-aligned pointer (`*mut u16`) (1 < 2 bytes)
--> tests/ui/cast_alignment.rs:22:5
--> tests/ui/cast_alignment.rs:19:5
|
LL | (&mut 1u8 as *mut u8) as *mut u16;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: casting from `*const u8` to a more-strictly-aligned pointer (`*const u16`) (1 < 2 bytes)
--> tests/ui/cast_alignment.rs:26:5
--> tests/ui/cast_alignment.rs:23:5
|
LL | (&1u8 as *const u8).cast::<u16>();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: casting from `*mut u8` to a more-strictly-aligned pointer (`*mut u16`) (1 < 2 bytes)
--> tests/ui/cast_alignment.rs:29:5
--> tests/ui/cast_alignment.rs:26:5
|
LL | (&mut 1u8 as *mut u8).cast::<u16>();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

11
tests/ui/iter_over_hash_type.rs
View file

@ -3,15 +3,18 @@
#![warn(clippy::iter_over_hash_type)]
use std::collections::{HashMap, HashSet};
extern crate rustc_data_structures;
extern crate proc_macros;
// Ensure it also works via type aliases (this isn't really the Fx hasher but that does not matter).
type FxBuildHasher = std::collections::hash_map::RandomState;
type FxHashMap<K, V> = HashMap<K, V, FxBuildHasher>;
type FxHashSet<K> = HashSet<K, FxBuildHasher>;
fn main() {
let mut hash_set = HashSet::<i32>::new();
let mut hash_map = HashMap::<i32, i32>::new();
let mut fx_hash_map = rustc_data_structures::fx::FxHashMap::<i32, i32>::default();
let mut fx_hash_set = rustc_data_structures::fx::FxHashMap::<i32, i32>::default();
let mut fx_hash_map = FxHashMap::<i32, i32>::default();
let mut fx_hash_set = FxHashSet::<i32>::default();
let vec = Vec::<i32>::new();
// test hashset

26
tests/ui/iter_over_hash_type.stderr
View file

@ -1,5 +1,5 @@
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:18:5
--> tests/ui/iter_over_hash_type.rs:21:5
|
LL | / for x in &hash_set {
LL | |
@ -11,7 +11,7 @@ LL | | }
= help: to override `-D warnings` add `#[allow(clippy::iter_over_hash_type)]`
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:22:5
--> tests/ui/iter_over_hash_type.rs:25:5
|
LL | / for x in hash_set.iter() {
LL | |
@ -20,7 +20,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:26:5
--> tests/ui/iter_over_hash_type.rs:29:5
|
LL | / for x in hash_set.clone() {
LL | |
@ -29,7 +29,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:30:5
--> tests/ui/iter_over_hash_type.rs:33:5
|
LL | / for x in hash_set.drain() {
LL | |
@ -38,7 +38,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:36:5
--> tests/ui/iter_over_hash_type.rs:39:5
|
LL | / for (x, y) in &hash_map {
LL | |
@ -47,7 +47,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:40:5
--> tests/ui/iter_over_hash_type.rs:43:5
|
LL | / for x in hash_map.keys() {
LL | |
@ -56,7 +56,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:44:5
--> tests/ui/iter_over_hash_type.rs:47:5
|
LL | / for x in hash_map.values() {
LL | |
@ -65,7 +65,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:48:5
--> tests/ui/iter_over_hash_type.rs:51:5
|
LL | / for x in hash_map.values_mut() {
LL | |
@ -74,7 +74,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:52:5
--> tests/ui/iter_over_hash_type.rs:55:5
|
LL | / for x in hash_map.iter() {
LL | |
@ -83,7 +83,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:56:5
--> tests/ui/iter_over_hash_type.rs:59:5
|
LL | / for x in hash_map.clone() {
LL | |
@ -92,7 +92,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:60:5
--> tests/ui/iter_over_hash_type.rs:63:5
|
LL | / for x in hash_map.drain() {
LL | |
@ -101,7 +101,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:66:5
--> tests/ui/iter_over_hash_type.rs:69:5
|
LL | / for x in fx_hash_set {
LL | |
@ -110,7 +110,7 @@ LL | | }
| |_____^
error: iteration over unordered hash-based type
--> tests/ui/iter_over_hash_type.rs:70:5
--> tests/ui/iter_over_hash_type.rs:73:5
|
LL | / for x in fx_hash_map {
LL | |

2
tests/ui/strlen_on_c_strings.fixed
View file

@ -1,7 +1,5 @@
#![warn(clippy::strlen_on_c_strings)]
#![allow(dead_code, clippy::manual_c_str_literals)]
#![feature(rustc_private)]
extern crate libc;
#[allow(unused)]
use libc::strlen;

2
tests/ui/strlen_on_c_strings.rs
View file

@ -1,7 +1,5 @@
#![warn(clippy::strlen_on_c_strings)]
#![allow(dead_code, clippy::manual_c_str_literals)]
#![feature(rustc_private)]
extern crate libc;
#[allow(unused)]
use libc::strlen;

14
tests/ui/strlen_on_c_strings.stderr
View file

@ -1,5 +1,5 @@
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:13:13
--> tests/ui/strlen_on_c_strings.rs:11:13
|
LL | let _ = unsafe { libc::strlen(cstring.as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `cstring.as_bytes().len()`
@ -8,37 +8,37 @@ LL | let _ = unsafe { libc::strlen(cstring.as_ptr()) };
= help: to override `-D warnings` add `#[allow(clippy::strlen_on_c_strings)]`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:18:13
--> tests/ui/strlen_on_c_strings.rs:16:13
|
LL | let _ = unsafe { libc::strlen(cstr.as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `cstr.to_bytes().len()`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:21:13
--> tests/ui/strlen_on_c_strings.rs:19:13
|
LL | let _ = unsafe { strlen(cstr.as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `cstr.to_bytes().len()`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:25:22
--> tests/ui/strlen_on_c_strings.rs:23:22
|
LL | let _ = unsafe { strlen((*pcstr).as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `(*pcstr).to_bytes().len()`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:31:22
--> tests/ui/strlen_on_c_strings.rs:29:22
|
LL | let _ = unsafe { strlen(unsafe_identity(cstr).as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unsafe_identity(cstr).to_bytes().len()`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:33:13
--> tests/ui/strlen_on_c_strings.rs:31:13
|
LL | let _ = unsafe { strlen(unsafe { unsafe_identity(cstr) }.as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `unsafe { unsafe_identity(cstr) }.to_bytes().len()`
error: using `libc::strlen` on a `CString` or `CStr` value
--> tests/ui/strlen_on_c_strings.rs:37:22
--> tests/ui/strlen_on_c_strings.rs:35:22
|
LL | let _ = unsafe { strlen(f(cstr).as_ptr()) };
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `f(cstr).to_bytes().len()`

2
tests/ui/useless_attribute.fixed
View file

@ -13,7 +13,7 @@
#[allow(unused_imports)]
#[allow(unused_extern_crates)]
#[macro_use]
extern crate rustc_middle;
extern crate regex as regex_crate;
#[macro_use]
extern crate proc_macro_derive;

2
tests/ui/useless_attribute.rs
View file

@ -13,7 +13,7 @@
#[allow(unused_imports)]
#[allow(unused_extern_crates)]
#[macro_use]
extern crate rustc_middle;
extern crate regex as regex_crate;
#[macro_use]
extern crate proc_macro_derive;