diff options
| author | bors <bors@rust-lang.org> | 2020-06-13 04:38:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-13 04:38:36 +0000 |
| commit | d107792af246c7c1bdedfbb9e61b13031eaf6ee1 (patch) | |
| tree | 3f1b5de0d7bcfec0226f6876a3bb6933e47f5231 | |
| parent | 49cae55760da0a43428eba73abcb659bb70cf2e4 (diff) | |
| parent | 9592e6738a542b6a316f3395b855c62fb70c4877 (diff) | |
| download | rust-d107792af246c7c1bdedfbb9e61b13031eaf6ee1.tar.gz rust-d107792af246c7c1bdedfbb9e61b13031eaf6ee1.zip | |
Auto merge of #73238 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] 1.44.1 release See release notes for details (or commits).
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | RELEASES.md | 13 | ||||
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| -rw-r--r-- | src/ci/docker/wasm32/Dockerfile | 3 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| m--------- | src/tools/rustfmt | 0 |
6 files changed, 21 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 3456b65e190..9b0d17c61a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.35" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118" +checksum = "18fbebbe1c9d1f383a9cc7e8ccdb471b91c8d024ee9c2ca5b5346121fe8b4399" dependencies = [ "cc", "compiler_builtins", @@ -292,7 +292,7 @@ dependencies = [ [[package]] name = "cargo" -version = "0.45.0" +version = "0.45.1" dependencies = [ "anyhow", "atty", @@ -4397,7 +4397,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.4.14" +version = "1.4.16" dependencies = [ "annotate-snippets", "bytecount", diff --git a/RELEASES.md b/RELEASES.md index 757821abcd1..45fe2e1fbb9 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 be2b0f36d14..8d6823ee1ea 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<Info>, diff --git a/src/ci/docker/wasm32/Dockerfile b/src/ci/docker/wasm32/Dockerfile index 91c492d03c1..8232539edda 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 diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 05d080faa4f2bc1e389ea7c4fd8f30ed2b733a7 +Subproject 88ba8575724c08a50eb265a05f3ff6d0883de1e diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject e417356684a36ae9c8c4014e8f0cd86650e40dd +Subproject 939e164c29f92bdbffdb156fa3d53aabbe9a2e0 |