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

Auto merge of #1490 - RalfJung:rustup, r=RalfJung

Browse Source 
rustup for new folder layout

Fixes the fallout from https://github.com/rust-lang/rust/pull/73265.

Blocked on a xargo release with https://github.com/japaric/xargo/pull/301.
This commit is contained in:
bors 2020-07-29 12:27:45 +00:00
commit abe55c2b5b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cargo-miri/bin.rs
View File

@ -10,7 +10,7 @@ use std::process::Command;
use rustc_version::VersionMeta;
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 21);
const XARGO_MIN_VERSION: (u32, u32, u32) = (0, 3, 22);
const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
@ -271,10 +271,10 @@ fn setup(subcommand: MiriCommand) {
.stdout;
let sysroot = std::str::from_utf8(&sysroot).unwrap();
let sysroot = Path::new(sysroot.trim_end_matches('\n'));
// Check for `$SYSROOT/lib/rustlib/src/rust/src`; test if that contains `libstd/lib.rs`.
// Check for `$SYSROOT/lib/rustlib/src/rust/library`; test if that contains `std/Cargo.toml`.
let rustup_src =
sysroot.join("lib").join("rustlib").join("src").join("rust").join("src");
if !rustup_src.join("libstd").join("lib.rs").exists() {
sysroot.join("lib").join("rustlib").join("src").join("rust").join("library");
if !rustup_src.join("std").join("Cargo.toml").exists() {
// Ask the user to install the `rust-src` component, and use that.
let mut cmd = Command::new("rustup");
cmd.args(&["component", "add", "rust-src"]);

2
rust-version
View File

@ -1 +1 @@
efc02b03d18b0cbaa55b1e421d792f70a39230b2
1454bbd4fdac9b7272b93fe82860613dccc0afad

2
tests/run-pass/panic/catch_panic.rs
View File

@ -1,4 +1,4 @@
// normalize-stderr-test "[^ ]*libcore/[a-z_/]+.rs[0-9:]*" -> "$$LOC"
// normalize-stderr-test "[^ ]*core/[a-z_/]+.rs[0-9:]*" -> "$$LOC"
#![feature(never_type)]
#![allow(unconditional_panic)]