Skip to content

Commit f8fafbc

Browse files
committed
Bump to 0.44.0.
1 parent f913212 commit f8fafbc

File tree

5 files changed

+2
-27
lines changed

5 files changed

+2
-27
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo"
3-
version = "0.43.0"
3+
version = "0.44.0"
44
edition = "2018"
55
authors = ["Yehuda Katz <[email protected]>",
66
"Carl Lerche <[email protected]>",

src/cargo/core/compiler/build_context/target_info.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ pub struct TargetInfo {
3939
pub rustflags: Vec<String>,
4040
/// Extra flags to pass to `rustdoc`, see `env_args`.
4141
pub rustdocflags: Vec<String>,
42-
// Remove this when it hits stable (1.41).
43-
pub supports_pathless_extern: Option<bool>,
4442
}
4543

4644
/// Kind of each file generated by a Unit, part of `FileType`.
@@ -103,13 +101,6 @@ impl TargetInfo {
103101
.args(&rustflags)
104102
.env_remove("RUSTC_LOG");
105103

106-
let mut pathless_test = process.clone();
107-
pathless_test.args(&["--extern", "proc_macro"]);
108-
let supports_pathless_extern = match kind {
109-
CompileKind::Host => Some(rustc.cached_output(&pathless_test).is_ok()),
110-
_ => None,
111-
};
112-
113104
if let CompileKind::Target(target) = kind {
114105
process.arg("--target").arg(target.rustc_target());
115106
}
@@ -192,7 +183,6 @@ impl TargetInfo {
192183
"RUSTDOCFLAGS",
193184
)?,
194185
cfg,
195-
supports_pathless_extern,
196186
})
197187
}
198188

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,13 +1018,7 @@ pub fn extern_args<'a>(
10181018
link_to(dep, dep.extern_crate_name, dep.noprelude)?;
10191019
}
10201020
}
1021-
if unit.target.proc_macro()
1022-
&& cx
1023-
.bcx
1024-
.info(CompileKind::Host)
1025-
.supports_pathless_extern
1026-
.unwrap()
1027-
{
1021+
if unit.target.proc_macro() {
10281022
// Automatically import `proc_macro`.
10291023
result.push(OsString::from("--extern"));
10301024
result.push(OsString::from("proc_macro"));

tests/testsuite/proc_macro.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,6 @@ Caused by:
443443

444444
#[cargo_test]
445445
fn proc_macro_extern_prelude() {
446-
if !is_nightly() {
447-
// remove once pathless `--extern` hits stable (1.41)
448-
return;
449-
}
450446
// Check that proc_macro is in the extern prelude.
451447
let p = project()
452448
.file(

tests/testsuite/rustc_info_cache.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ use std::env;
66

77
#[cargo_test]
88
fn rustc_info_cache() {
9-
if !cargo_test_support::is_nightly() {
10-
// remove once pathless `--extern` hits stable (1.41)
11-
return;
12-
}
13-
149
let p = project()
1510
.file("src/main.rs", r#"fn main() { println!("hello"); }"#)
1611
.build();

0 commit comments

Comments
 (0)