From e6fa2b7a23b91f20280a1d8464a11c34f5556744 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Jan 2019 21:57:30 +0000 Subject: dev-lang/rust : version bump --- dev-lang/rust/files/1.29.2-clippy-sysroot.patch | 62 ------------------------- dev-lang/rust/files/1.30.1-clippy-sysroot.patch | 62 +++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 dev-lang/rust/files/1.29.2-clippy-sysroot.patch create mode 100644 dev-lang/rust/files/1.30.1-clippy-sysroot.patch (limited to 'dev-lang/rust/files') diff --git a/dev-lang/rust/files/1.29.2-clippy-sysroot.patch b/dev-lang/rust/files/1.29.2-clippy-sysroot.patch deleted file mode 100644 index 6a527e5a..00000000 --- a/dev-lang/rust/files/1.29.2-clippy-sysroot.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/src/tools/clippy/src/driver.rs 2018-10-04 16:30:42.438486058 +0300 -+++ b/src/tools/clippy/src/driver.rs 2018-10-04 16:31:45.044484028 +0300 -@@ -20,54 +20,22 @@ - return; - } - -- let sys_root = option_env!("SYSROOT") -- .map(String::from) -- .or_else(|| std::env::var("SYSROOT").ok()) -- .or_else(|| { -- let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); -- let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); -- home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) -- }) -- .or_else(|| { -- Command::new("rustc") -- .arg("--print") -- .arg("sysroot") -- .output() -- .ok() -- .and_then(|out| String::from_utf8(out.stdout).ok()) -- .map(|s| s.trim().to_owned()) -- }) -- .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); -- - // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. - // We're invoking the compiler programmatically, so we ignore this/ -- let mut orig_args: Vec = env::args().collect(); -- if orig_args.len() <= 1 { -+ let mut args: Vec = env::args().collect(); -+ if args.len() <= 1 { - std::process::exit(1); - } -- if orig_args[1] == "rustc" { -+ if args[1] == "rustc" { - // we still want to be able to invoke it normally though -- orig_args.remove(1); -+ args.remove(1); - } -- // this conditional check for the --sysroot flag is there so users can call -- // `clippy_driver` directly -- // without having to pass --sysroot or anything -- let mut args: Vec = if orig_args.iter().any(|s| s == "--sysroot") { -- orig_args.clone() -- } else { -- orig_args -- .clone() -- .into_iter() -- .chain(Some("--sysroot".to_owned())) -- .chain(Some(sys_root)) -- .collect() -- }; - - // this check ensures that dependencies are built but not linted and the final - // crate is - // linted but not built - let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true") -- || orig_args.iter().any(|s| s == "--emit=dep-info,metadata"); -+ || args.iter().any(|s| s == "--emit=dep-info,metadata"); - - if clippy_enabled { - args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); diff --git a/dev-lang/rust/files/1.30.1-clippy-sysroot.patch b/dev-lang/rust/files/1.30.1-clippy-sysroot.patch new file mode 100644 index 00000000..d38f8ba5 --- /dev/null +++ b/dev-lang/rust/files/1.30.1-clippy-sysroot.patch @@ -0,0 +1,62 @@ +--- a/src/tools/clippy/src/driver.rs 2018-10-25 20:09:06.143109996 +0300 ++++ b/src/tools/clippy/src/driver.rs 2018-10-25 20:11:09.204106005 +0300 +@@ -29,54 +29,22 @@ + exit(0); + } + +- let sys_root = option_env!("SYSROOT") +- .map(String::from) +- .or_else(|| std::env::var("SYSROOT").ok()) +- .or_else(|| { +- let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME")); +- let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN")); +- home.and_then(|home| toolchain.map(|toolchain| format!("{}/toolchains/{}", home, toolchain))) +- }) +- .or_else(|| { +- Command::new("rustc") +- .arg("--print") +- .arg("sysroot") +- .output() +- .ok() +- .and_then(|out| String::from_utf8(out.stdout).ok()) +- .map(|s| s.trim().to_owned()) +- }) +- .expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust"); +- + // Setting RUSTC_WRAPPER causes Cargo to pass 'rustc' as the first argument. + // We're invoking the compiler programmatically, so we ignore this/ +- let mut orig_args: Vec = env::args().collect(); +- if orig_args.len() <= 1 { ++ let mut args: Vec = env::args().collect(); ++ if args.len() <= 1 { + std::process::exit(1); + } +- if Path::new(&orig_args[1]).file_stem() == Some("rustc".as_ref()) { ++ if Path::new(&args[1]).file_stem() == Some("rustc".as_ref()) { + // we still want to be able to invoke it normally though +- orig_args.remove(1); ++ args.remove(1); + } +- // this conditional check for the --sysroot flag is there so users can call +- // `clippy_driver` directly +- // without having to pass --sysroot or anything +- let mut args: Vec = if orig_args.iter().any(|s| s == "--sysroot") { +- orig_args.clone() +- } else { +- orig_args +- .clone() +- .into_iter() +- .chain(Some("--sysroot".to_owned())) +- .chain(Some(sys_root)) +- .collect() +- }; + + // this check ensures that dependencies are built but not linted and the final + // crate is + // linted but not built + let clippy_enabled = env::var("CLIPPY_TESTS").ok().map_or(false, |val| val == "true") +- || orig_args.iter().any(|s| s == "--emit=dep-info,metadata"); ++ || args.iter().any(|s| s == "--emit=dep-info,metadata"); + + if clippy_enabled { + args.extend_from_slice(&["--cfg".to_owned(), r#"feature="cargo-clippy""#.to_owned()]); -- cgit v1.2.3