From f8fafbc3dec6370b410d074953f166265ae4fb06 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Fri, 31 Jan 2020 12:05:14 -0800
Subject: [PATCH] Bump to 0.44.0.

---
 Cargo.toml                                           |  2 +-
 src/cargo/core/compiler/build_context/target_info.rs | 10 ----------
 src/cargo/core/compiler/mod.rs                       |  8 +-------
 tests/testsuite/proc_macro.rs                        |  4 ----
 tests/testsuite/rustc_info_cache.rs                  |  5 -----
 5 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 99ab958ab..6df8d17a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo"
-version = "0.43.0"
+version = "0.44.0"
 edition = "2018"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
diff --git a/src/cargo/core/compiler/build_context/target_info.rs b/src/cargo/core/compiler/build_context/target_info.rs
index dc4440b7d..cfcd38848 100644
--- a/src/cargo/core/compiler/build_context/target_info.rs
+++ b/src/cargo/core/compiler/build_context/target_info.rs
@@ -39,8 +39,6 @@ pub struct TargetInfo {
     pub rustflags: Vec<String>,
     /// Extra flags to pass to `rustdoc`, see `env_args`.
     pub rustdocflags: Vec<String>,
-    // Remove this when it hits stable (1.41).
-    pub supports_pathless_extern: Option<bool>,
 }
 
 /// Kind of each file generated by a Unit, part of `FileType`.
@@ -103,13 +101,6 @@ impl TargetInfo {
             .args(&rustflags)
             .env_remove("RUSTC_LOG");
 
-        let mut pathless_test = process.clone();
-        pathless_test.args(&["--extern", "proc_macro"]);
-        let supports_pathless_extern = match kind {
-            CompileKind::Host => Some(rustc.cached_output(&pathless_test).is_ok()),
-            _ => None,
-        };
-
         if let CompileKind::Target(target) = kind {
             process.arg("--target").arg(target.rustc_target());
         }
@@ -192,7 +183,6 @@ impl TargetInfo {
                 "RUSTDOCFLAGS",
             )?,
             cfg,
-            supports_pathless_extern,
         })
     }
 
diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs
index 29805bb3e..5052d790d 100644
--- a/src/cargo/core/compiler/mod.rs
+++ b/src/cargo/core/compiler/mod.rs
@@ -1018,13 +1018,7 @@ pub fn extern_args<'a>(
             link_to(dep, dep.extern_crate_name, dep.noprelude)?;
         }
     }
-    if unit.target.proc_macro()
-        && cx
-            .bcx
-            .info(CompileKind::Host)
-            .supports_pathless_extern
-            .unwrap()
-    {
+    if unit.target.proc_macro() {
         // Automatically import `proc_macro`.
         result.push(OsString::from("--extern"));
         result.push(OsString::from("proc_macro"));
diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs
index 32abb29f5..be5d024e1 100644
--- a/tests/testsuite/proc_macro.rs
+++ b/tests/testsuite/proc_macro.rs
@@ -443,10 +443,6 @@ Caused by:
 
 #[cargo_test]
 fn proc_macro_extern_prelude() {
-    if !is_nightly() {
-        // remove once pathless `--extern` hits stable (1.41)
-        return;
-    }
     // Check that proc_macro is in the extern prelude.
     let p = project()
         .file(
diff --git a/tests/testsuite/rustc_info_cache.rs b/tests/testsuite/rustc_info_cache.rs
index 5375b0bc9..52d0eccde 100644
--- a/tests/testsuite/rustc_info_cache.rs
+++ b/tests/testsuite/rustc_info_cache.rs
@@ -6,11 +6,6 @@ use std::env;
 
 #[cargo_test]
 fn rustc_info_cache() {
-    if !cargo_test_support::is_nightly() {
-        // remove once pathless `--extern` hits stable (1.41)
-        return;
-    }
-
     let p = project()
         .file("src/main.rs", r#"fn main() { println!("hello"); }"#)
         .build();