From a0dfbb7a967f465ed034334a0cd2bd2e4cb60511 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 28 Nov 2017 17:44:25 -0800
Subject: [PATCH 1/2] Fix the lockfile-compat test

The newest version of `tar` tweaks the checksum here slightly as the tarball is
slightly different, so this just updates the test to pull the checksum from the
publication rather than hardcoding it.
---
 tests/lockfile-compat.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/lockfile-compat.rs b/tests/lockfile-compat.rs
index 0c90fd417ad..c8a16aa2ed4 100644
--- a/tests/lockfile-compat.rs
+++ b/tests/lockfile-compat.rs
@@ -79,9 +79,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 #[test]
 fn frozen_flag_preserves_old_lockfile() {
-    Package::new("foo", "0.1.0").publish();
+    let cksum = Package::new("foo", "0.1.0").publish();
 
-    let old_lockfile =
+    let old_lockfile = format!(
         r#"[root]
 name = "zzz"
 version = "0.0.1"
@@ -95,8 +95,10 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
-"checksum foo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f9e0a16bdf5c05435698fa27192d89e331b22a26a972c34984f560662544453b"
-"#;
+"checksum foo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "{}"
+"#,
+    cksum,
+    );
 
     let p = project("bar")
         .file("Cargo.toml", r#"
@@ -109,7 +111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
             foo = "0.1.0"
         "#)
         .file("src/lib.rs", "")
-        .file("Cargo.lock", old_lockfile)
+        .file("Cargo.lock", &old_lockfile)
         .build();
 
     assert_that(p.cargo("build").arg("--locked"),

From 5c7482af81bd0484e994a28e9f3f4bbf7aa84c70 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 28 Nov 2017 18:16:37 -0800
Subject: [PATCH 2/2] Pin nightlies temporarily

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6baf7dc73bd..993f73a34dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,8 @@ matrix:
 
     - env: TARGET=x86_64-unknown-linux-gnu
            ALT=i686-unknown-linux-gnu
-      rust: nightly
+      # FIXME(rust-lang/rust#46271) should use just `nightly`
+      rust: nightly-2017-11-20
       install:
         - mdbook --help || cargo install mdbook --force
       script: