Merge pull request #720 from RalfJung/rustup

fix for latest Rust

Author: oli-obk

rust-version

@@ -1 +1 @@
-fe0a415b4ba3310c2263f07e0253e2434310299c
+7c71bc3208031b1307573de45a3b3e18fa45787a

src/bin/cargo-miri.rs

@@ -133,7 +133,11 @@ fn xargo_version() -> Option<(u32, u32, u32)> {
         (split.next().expect("malformed `xargo --version` output: empty"),
          split.next().expect("malformed `xargo --version` output: not at least two words"))
     };
-    if name != "xargo" {
+    if name == "xargo" {
+        // This is the upstream version which is currently broken, we need our fork.
+        return None;
+    }
+    if name != "xargo-rj" {
         panic!("malformed `xargo --version` output: application name is not `xargo`");
     }
     let mut version_pieces = version.split('.');
@@ -183,11 +187,11 @@ fn setup(ask_user: bool) {
     let xargo = xargo_version();
     if xargo.map_or(true, |v| v < (0, 3, 13)) {
         if ask_user {
-            ask("It seems you do not have a recent enough xargo installed. I will run `cargo install xargo -f`. Proceed?");
+            ask("It seems you do not have a recent enough xargo installed. I will run `cargo install --git https://github.com/RalfJung/xargo -f`. Proceed?");
         } else {
-            println!("Installing xargo: `cargo install xargo -f`");
+            println!("Installing xargo: `cargo install --git https://github.com/RalfJung/xargo -f`");
         }
-        if !Command::new("cargo").args(&["install", "xargo", "-f"]).status().unwrap().success() {
+        if !Command::new("cargo").args(&["install", "--git", "https://github.com/RalfJung/xargo", "-f"]).status().unwrap().success() {
             show_error(format!("Failed to install xargo"));
         }
     }

tests/run-pass/async-fn.rs

@@ -1,7 +1,6 @@
 #![feature(
     async_await,
     await_macro,
-    futures_api,
 )]
 
 use std::{future::Future, pin::Pin, task::Poll, ptr};

tests/run-pass/hashmap.rs

@@ -7,13 +7,10 @@ fn test_map<S: BuildHasher>(mut map: HashMap<i32, i32, S>) {
     map.insert(0, 0);
     assert_eq!(map.values().fold(0, |x, y| x+y), 0);
 
-    let table_base = map.get(&0).unwrap() as *const _;
-
-    let num = 22; // large enough to trigger a resize
+    let num = 25;
     for i in 1..num {
         map.insert(i, i);
     }
-    assert!(table_base != map.get(&0).unwrap() as *const _); // make sure relocation happened
     assert_eq!(map.values().fold(0, |x, y| x+y), num*(num-1)/2); // check the right things are in the table now
 
     // Inserting again replaces the existing entries