Skip to content

Commit f82e30d

Browse files
tesujitesuji
committed
Fix error E0460 when compiled on Rustc repo
1 parent 4ad6fb3 commit f82e30d

File tree

3 files changed

+77
-89
lines changed

3 files changed

+77
-89
lines changed

‎tests/cargo/mod.rs

Lines changed: 14 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,29 @@
1-
use cargo_metadata::{Message::CompilerArtifact, MetadataCommand};
1+
use lazy_static::lazy_static;
22
use std::env;
3-
use std::ffi::OsStr;
4-
use std::mem;
53
use std::path::PathBuf;
6-
use std::process::Command;
74

8-
pub struct BuildInfo {
9-
cargo_target_dir: PathBuf,
10-
}
11-
12-
impl BuildInfo {
13-
pub fn new() -> Self {
14-
let data = MetadataCommand::new().exec().unwrap();
15-
Self {
16-
cargo_target_dir: data.target_directory,
5+
lazy_static! {
6+
pub static ref CARGO_TARGET_DIR: PathBuf = {
7+
match env::var_os("CARGO_TARGET_DIR") {
8+
Some(v) => v.into(),
9+
None => "target".into(),
1710
}
18-
}
19-
20-
pub fn host_lib(&self) -> PathBuf {
21-
if let Some(path) = option_env!("HOST_LIBS") {
22-
PathBuf::from(path)
23-
} else {
24-
self.cargo_target_dir.join(env!("PROFILE"))
25-
}
26-
}
27-
28-
pub fn target_lib(&self) -> PathBuf {
11+
};
12+
pub static ref TARGET_LIB: PathBuf = {
2913
if let Some(path) = option_env!("TARGET_LIBS") {
3014
path.into()
3115
} else {
32-
let mut dir = self.cargo_target_dir.clone();
16+
let mut dir = CARGO_TARGET_DIR.clone();
3317
if let Some(target) = env::var_os("CARGO_BUILD_TARGET") {
3418
dir.push(target);
3519
}
3620
dir.push(env!("PROFILE"));
3721
dir
3822
}
39-
}
40-
41-
pub fn clippy_driver_path(&self) -> PathBuf {
42-
if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
43-
PathBuf::from(path)
44-
} else {
45-
self.target_lib().join("clippy-driver")
46-
}
47-
}
48-
49-
// When we'll want to use `extern crate ..` for a dependency that is used
50-
// both by the crate and the compiler itself, we can't simply pass -L flags
51-
// as we'll get a duplicate matching versions. Instead, disambiguate with
52-
// `--extern dep=path`.
53-
// See https://github.com/rust-lang/rust-clippy/issues/4015.
54-
pub fn third_party_crates() -> Vec<(&'static str, PathBuf)> {
55-
const THIRD_PARTY_CRATES: [&str; 4] = ["serde", "serde_derive", "regex", "clippy_lints"];
56-
let cargo = env::var_os("CARGO");
57-
let cargo = cargo.as_deref().unwrap_or_else(|| OsStr::new("cargo"));
58-
let output = Command::new(cargo)
59-
.arg("build")
60-
.arg("--test=compile-test")
61-
.arg("--message-format=json")
62-
.output()
63-
.unwrap();
23+
};
24+
}
6425

65-
let mut crates = Vec::with_capacity(THIRD_PARTY_CRATES.len());
66-
for message in cargo_metadata::parse_messages(output.stdout.as_slice()) {
67-
if let CompilerArtifact(mut artifact) = message.unwrap() {
68-
if let Some(&krate) = THIRD_PARTY_CRATES.iter().find(|&&krate| krate == artifact.target.name) {
69-
crates.push((krate, mem::take(&mut artifact.filenames[0])));
70-
}
71-
}
72-
}
73-
crates
74-
}
26+
#[must_use]
27+
pub fn is_rustc_test_suite() -> bool {
28+
option_env!("RUSTC_TEST_SUITE").is_some()
7529
}

‎tests/compile-test.rs

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(test)]
1+
#![feature(test)] // compiletest_rs requires this attribute
22

33
use compiletest_rs as compiletest;
44
use compiletest_rs::common::Mode as TestMode;
@@ -11,51 +11,86 @@ use std::path::{Path, PathBuf};
1111

1212
mod cargo;
1313

14-
#[must_use]
15-
fn rustc_test_suite() -> Option<PathBuf> {
16-
option_env!("RUSTC_TEST_SUITE").map(PathBuf::from)
14+
fn host_lib() -> PathBuf {
15+
if let Some(path) = option_env!("HOST_LIBS") {
16+
PathBuf::from(path)
17+
} else {
18+
cargo::CARGO_TARGET_DIR.join(env!("PROFILE"))
19+
}
1720
}
1821

19-
#[must_use]
20-
fn rustc_lib_path() -> PathBuf {
21-
option_env!("RUSTC_LIB_PATH").unwrap().into()
22+
fn clippy_driver_path() -> PathBuf {
23+
if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") {
24+
PathBuf::from(path)
25+
} else {
26+
cargo::TARGET_LIB.join("clippy-driver")
27+
}
28+
}
29+
30+
// When we'll want to use `extern crate ..` for a dependency that is used
31+
// both by the crate and the compiler itself, we can't simply pass -L flags
32+
// as we'll get a duplicate matching versions. Instead, disambiguate with
33+
// `--extern dep=path`.
34+
// See https://github.com/rust-lang/rust-clippy/issues/4015.
35+
fn third_party_crates() -> String {
36+
use std::collections::hash_map::Entry::*;
37+
use std::collections::HashMap;
38+
static CRATES: &[&str] = &["serde", "serde_derive", "regex", "clippy_lints"];
39+
let dep_dir = cargo::TARGET_LIB.join("deps");
40+
let mut crates: HashMap<&str, PathBuf> = HashMap::with_capacity(CRATES.len());
41+
for entry in fs::read_dir(dep_dir).unwrap() {
42+
let path = match entry {
43+
Ok(entry) => entry.path(),
44+
_ => continue,
45+
};
46+
if let Some(name) = path.file_name().and_then(OsStr::to_str) {
47+
for dep in CRATES {
48+
if name.starts_with(&format!("lib{}-", dep)) && name.ends_with(".rlib") {
49+
if let Vacant(entry) = crates.entry(dep) {
50+
entry.insert(path);
51+
}
52+
break;
53+
}
54+
}
55+
}
56+
}
57+
58+
let v: Vec<_> = crates
59+
.into_iter()
60+
.map(|(dep, path)| format!("--extern {}={}", dep, path.display()))
61+
.collect();
62+
v.join(" ")
2263
}
2364

2465
fn default_config() -> compiletest::Config {
25-
let build_info = cargo::BuildInfo::new();
2666
let mut config = compiletest::Config::default();
2767

2868
if let Ok(name) = env::var("TESTNAME") {
2969
config.filter = Some(name);
3070
}
3171

32-
if rustc_test_suite().is_some() {
33-
let path = rustc_lib_path();
72+
if let Some(path) = option_env!("RUSTC_LIB_PATH") {
73+
let path = PathBuf::from(path);
3474
config.run_lib_path = path.clone();
3575
config.compile_lib_path = path;
3676
}
3777

38-
let disambiguated: Vec<_> = cargo::BuildInfo::third_party_crates()
39-
.iter()
40-
.map(|(krate, path)| format!("--extern {}={}", krate, path.display()))
41-
.collect();
42-
4378
config.target_rustcflags = Some(format!(
4479
"-L {0} -L {1} -Dwarnings -Zui-testing {2}",
45-
build_info.host_lib().join("deps").display(),
46-
build_info.target_lib().join("deps").display(),
47-
disambiguated.join(" ")
80+
host_lib().join("deps").display(),
81+
cargo::TARGET_LIB.join("deps").display(),
82+
third_party_crates(),
4883
));
4984

50-
config.build_base = if rustc_test_suite().is_some() {
51-
// we don't need access to the stderr files on travis
85+
config.build_base = if cargo::is_rustc_test_suite() {
86+
// This make the stderr files go to clippy OUT_DIR on rustc repo build dir
5287
let mut path = PathBuf::from(env!("OUT_DIR"));
5388
path.push("test_build_base");
5489
path
5590
} else {
56-
build_info.host_lib().join("test_build_base")
91+
host_lib().join("test_build_base")
5792
};
58-
config.rustc_path = build_info.clippy_driver_path();
93+
config.rustc_path = clippy_driver_path();
5994
config
6095
}
6196

‎tests/dogfood.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1+
// Dogfood cannot run on Windows
2+
#![cfg(not(windows))]
3+
14
use lazy_static::lazy_static;
25
use std::path::PathBuf;
36
use std::process::Command;
47

5-
#[allow(dead_code)]
68
mod cargo;
79

810
lazy_static! {
9-
static ref CLIPPY_PATH: PathBuf = {
10-
let build_info = cargo::BuildInfo::new();
11-
build_info.target_lib().join("cargo-clippy")
12-
};
11+
static ref CLIPPY_PATH: PathBuf = cargo::TARGET_LIB.join("cargo-clippy");
1312
}
1413

1514
#[test]
1615
fn dogfood_clippy() {
1716
// run clippy on itself and fail the test if lint warnings are reported
18-
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
17+
if cargo::is_rustc_test_suite() {
1918
return;
2019
}
2120
let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -44,7 +43,7 @@ fn dogfood_clippy() {
4443
#[test]
4544
fn dogfood_subprojects() {
4645
// run clippy on remaining subprojects and fail the test if lint warnings are reported
47-
if option_env!("RUSTC_TEST_SUITE").is_some() || cfg!(windows) {
46+
if cargo::is_rustc_test_suite() {
4847
return;
4948
}
5049
let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));

0 commit comments

Comments
 (0)