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

Clippy after rustup

Browse Source
This commit is contained in:
Oli Scherer 2022-09-02 13:55:26 +00:00
parent 7155a2190e
commit 6a29a6842a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cargo-miri/src/setup.rs
View File

@ -76,7 +76,7 @@ pub fn setup(subcommand: &MiriCommand, host: &str, target: &str) {
show_error!("xargo is too old; please upgrade to the latest version") show_error!("xargo is too old; please upgrade to the latest version")
} }
let mut cmd = cargo(); let mut cmd = cargo();
cmd.args(&["install", "xargo"]); cmd.args(["install", "xargo"]);
ask_to_run(cmd, ask_user, "install a recent enough xargo"); ask_to_run(cmd, ask_user, "install a recent enough xargo");
} }
@ -93,7 +93,7 @@ pub fn setup(subcommand: &MiriCommand, host: &str, target: &str) {
None => { None => {
// Check for `rust-src` rustup component. // Check for `rust-src` rustup component.
let output = miri_for_host() let output = miri_for_host()
.args(&["--print", "sysroot"]) .args(["--print", "sysroot"])
.output() .output()
.expect("failed to determine sysroot"); .expect("failed to determine sysroot");
if !output.status.success() { if !output.status.success() {
@ -110,7 +110,7 @@ pub fn setup(subcommand: &MiriCommand, host: &str, target: &str) {
if !rustup_src.join("std").join("Cargo.toml").exists() { if !rustup_src.join("std").join("Cargo.toml").exists() {
// Ask the user to install the `rust-src` component, and use that. // Ask the user to install the `rust-src` component, and use that.
let mut cmd = Command::new("rustup"); let mut cmd = Command::new("rustup");
cmd.args(&["component", "add", "rust-src"]); cmd.args(["component", "add", "rust-src"]);
ask_to_run( ask_to_run(
cmd, cmd,
ask_user, ask_user,
@ -136,7 +136,7 @@ pub fn setup(subcommand: &MiriCommand, host: &str, target: &str) {
let dirs = directories::ProjectDirs::from("org", "rust-lang", "miri").unwrap(); let dirs = directories::ProjectDirs::from("org", "rust-lang", "miri").unwrap();
let dir = dirs.cache_dir(); let dir = dirs.cache_dir();
if !dir.exists() { if !dir.exists() {
fs::create_dir_all(&dir).unwrap(); fs::create_dir_all(dir).unwrap();
} }
// The interesting bit: Xargo.toml (only needs content if we actually need std) // The interesting bit: Xargo.toml (only needs content if we actually need std)
let xargo_toml = if std::env::var_os("MIRI_NO_STD").is_some() { let xargo_toml = if std::env::var_os("MIRI_NO_STD").is_some() {
@ -178,8 +178,8 @@ pub fn setup(subcommand: &MiriCommand, host: &str, target: &str) {
// Now invoke xargo. // Now invoke xargo.
let mut command = xargo_check(); let mut command = xargo_check();
command.arg("check").arg("-q"); command.arg("check").arg("-q");
command.current_dir(&dir); command.current_dir(dir);
command.env("XARGO_HOME", &dir); command.env("XARGO_HOME", dir);
command.env("XARGO_RUST_SRC", &rust_src); command.env("XARGO_RUST_SRC", &rust_src);
// We always need to set a target so rustc bootstrap can tell apart host from target crates. // We always need to set a target so rustc bootstrap can tell apart host from target crates.
command.arg("--target").arg(target); command.arg("--target").arg(target);