nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update compile-test to follow new lint

Browse Source
This commit is contained in:
JarredAllen 2020-06-27 16:55:47 -07:00
parent 6ce981225b
commit 6e2d55c8db
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/compile-test.rs
View File

@ -12,19 +12,11 @@ use std::path::{Path, PathBuf};
mod cargo; mod cargo;
fn host_lib() -> PathBuf { fn host_lib() -> PathBuf {
if let Some(path) = option_env!("HOST_LIBS") { option_env!("HOST_LIBS").map_or(cargo::CARGO_TARGET_DIR.join(env!("PROFILE")), PathBuf::from)
PathBuf::from(path)
} else {
cargo::CARGO_TARGET_DIR.join(env!("PROFILE"))
}
} }
fn clippy_driver_path() -> PathBuf { fn clippy_driver_path() -> PathBuf {
if let Some(path) = option_env!("CLIPPY_DRIVER_PATH") { option_env!("CLIPPY_DRIVER_PATH").map_or(cargo::TARGET_LIB.join("clippy-driver"), PathBuf::from)
PathBuf::from(path)
} else {
cargo::TARGET_LIB.join("clippy-driver")
}
} }
// When we'll want to use `extern crate ..` for a dependency that is used // When we'll want to use `extern crate ..` for a dependency that is used