Bump to 0.44.0.

This commit is contained in:
Eric Huss 2020-01-31 12:05:14 -08:00
parent f9132126af
commit f8fafbc3de
5 changed files with 2 additions and 27 deletions

View file

@ -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>",

View file

@ -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,
})
}

View file

@ -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"));

View file

@ -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(

View file

@ -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();