Skip to content

Commit 4a5b913

Browse files
committedMar 16, 2020
Auto merge of #70053 - Centril:rollup-lumng3d, r=Centril
Rollup of 7 pull requests Successful merges: - #69870 (expand: Implement something similar to `#[cfg(accessible(path))]`) - #69881 (VariantSizeDifferences: bail on SizeOverflow) - #70000 (resolve: Fix regression in resolution of raw keywords in paths) - #70029 (Bump the bootstrap compiler) - #70046 (Use sublice patterns to avoid computing the len) - #70049 (Fiddle `ParamEnv` through to a place that used to use `ParamEnv::empty` in a buggy manner) - #70051 (Allow `hir().find` to return `None`) Failed merges: r? @ghost
2 parents dd67187 + 9d325cf commit 4a5b913

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+596
-244
lines changed
 

‎src/bootstrap/builder.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ impl<'a> Builder<'a> {
725725
self.clear_if_dirty(&my_out, &rustdoc);
726726
}
727727

728-
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd).arg("-Zconfig-profile");
728+
cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd);
729729

730730
let profile_var = |name: &str| {
731731
let profile = if self.config.rust_optimize { "RELEASE" } else { "DEV" };
@@ -847,13 +847,7 @@ impl<'a> Builder<'a> {
847847
rustflags.arg("-Zforce-unstable-if-unmarked");
848848
}
849849

850-
// cfg(bootstrap): the flag was renamed from `-Zexternal-macro-backtrace`
851-
// to `-Zmacro-backtrace`, keep only the latter after beta promotion.
852-
if stage == 0 {
853-
rustflags.arg("-Zexternal-macro-backtrace");
854-
} else {
855-
rustflags.arg("-Zmacro-backtrace");
856-
}
850+
rustflags.arg("-Zmacro-backtrace");
857851

858852
let want_rustdoc = self.doc_tests != DocTests::No;
859853

‎src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use build_helper::output;
1313
use crate::Build;
1414

1515
// The version number
16-
pub const CFG_RELEASE_NUM: &str = "1.43.0";
16+
pub const CFG_RELEASE_NUM: &str = "1.44.0";
1717

1818
pub struct GitInfo {
1919
inner: Option<Info>,

0 commit comments

Comments
 (0)