From 688c9bd0330030c1997dd72fa08c64f26f4616d6 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 11 Jun 2020 09:11:30 -0400 Subject: [PATCH 1/6] Bump rustfmt to 1.4.16 This corrects a breaking change where `#[cfg_attr(rustfmt, rustfmt_skip)]` stopped working in 1.44.0. --- Cargo.lock | 2 +- src/tools/rustfmt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3456b65e19009..b7179dbd8d70a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4397,7 +4397,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.4.14" +version = "1.4.16" dependencies = [ "annotate-snippets", "bytecount", diff --git a/src/tools/rustfmt b/src/tools/rustfmt index e417356684a36..939e164c29f92 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit e417356684a36ae9c8c4014e8f0cd86650e40dd2 +Subproject commit 939e164c29f92bdbffdb156fa3d53aabbe9a2e0b From 20918cf4cca22b12b0edf0c887129b21bf337555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Sun, 26 Apr 2020 00:00:00 +0000 Subject: [PATCH 2/6] Update backtrace-sys crate to 0.1.36 * Fix an off-by-one error in backtrace-sys * Only explicitly configure debuginfo in rustc-dep-of-std --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b7179dbd8d70a..904821d5f9f69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118" +checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7" dependencies = [ "cc", "compiler_builtins", From 130e1140b543f566720fce9e320dc26d22db704e Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Thu, 30 Apr 2020 12:29:40 -0700 Subject: [PATCH 3/6] Update backtrace-sys Diff: - Don't look for old RUSTC_DEBUGINFO vars (rust-lang/backtrace-rs#313) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 904821d5f9f69..123545019bd8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7" +checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399" dependencies = [ "cc", "compiler_builtins", From 682361a597ef632765ccee6e3d7f056576683af8 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 11 Jun 2020 09:08:48 -0400 Subject: [PATCH 4/6] 1.44.1 release --- RELEASES.md | 13 +++++++++++++ src/bootstrap/channel.rs | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/RELEASES.md b/RELEASES.md index 757821abcd153..45fe2e1fbb925 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,16 @@ +Version 1.44.1 (2020-06-18) +=========================== + +* [rustfmt accepts rustfmt_skip in cfg_attr again.][73078] +* [Fix fingerprinting for lld on Windows with dylib.][cargo/8290] +* [Don't hash executable filenames on apple platforms.][cargo/8329] +* [Fix crashes when finding backtrace on macOS.][71397] + +[71397]: https://github.com/rust-lang/rust/issues/71397 +[73078]: https://github.com/rust-lang/rust/issues/73078 +[cargo/8290]: https://github.com/rust-lang/cargo/pull/8290 +[cargo/8329]: https://github.com/rust-lang/cargo/pull/8329 + Version 1.44.0 (2020-06-04) ========================== diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index be2b0f36d14a7..8d6823ee1eae2 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -13,7 +13,7 @@ use build_helper::output; use crate::Build; // The version number -pub const CFG_RELEASE_NUM: &str = "1.44.0"; +pub const CFG_RELEASE_NUM: &str = "1.44.1"; pub struct GitInfo { inner: Option, From 7b2237eb160ee6155eb0aca129c3c2dc9e4f8f03 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Fri, 12 Jun 2020 10:05:11 -0400 Subject: [PATCH 5/6] Update cargo --- Cargo.lock | 2 +- src/tools/cargo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 123545019bd8d..9b0d17c61a389 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -292,7 +292,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.45.0" +version = "0.45.1" dependencies = [ "anyhow", "atty", diff --git a/src/tools/cargo b/src/tools/cargo index 05d080faa4f2b..88ba8575724c0 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 05d080faa4f2bc1e389ea7c4fd8f30ed2b733a7f +Subproject commit 88ba8575724c08a50eb265a05f3ff6d0883de1ee From 9592e6738a542b6a316f3395b855c62fb70c4877 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 10 Jun 2020 06:02:42 -0700 Subject: [PATCH 6/6] Fix emcc failure for wasm32. --- src/ci/docker/wasm32/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ci/docker/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile index 91c492d03c179..8232539edda77 100644 --- a/src/ci/docker/wasm32/Dockerfile +++ b/src/ci/docker/wasm32/Dockerfile @@ -27,6 +27,9 @@ ENV PATH=$PATH:/emsdk-portable ENV PATH=$PATH:/emsdk-portable/upstream/emscripten/ ENV PATH=$PATH:/emsdk-portable/node/12.9.1_64bit/bin/ ENV BINARYEN_ROOT=/emsdk-portable/upstream/ +ENV EMSDK=/emsdk-portable +ENV EM_CONFIG=/emsdk-portable/.emscripten +ENV EM_CACHE=/emsdk-portable/upstream/emscripten/cache ENV TARGETS=wasm32-unknown-emscripten