Auto merge of rust-lang#73238 - Mark-Simulacrum:stable-next, r=Mark-S…

…imulacrum [stable] 1.44.1 release See release notes for details (or commits).
Mark-Simulacrum · Jun 13, 2020 · d107792 · d107792
2 parents 49cae55 + 9592e67
commit d107792
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
+1 −1		Cargo.toml
+52 −37		src/cargo/core/compiler/context/compilation_files.rs
+1 −1		tests/testsuite/build.rs
+2 −2		tests/testsuite/collisions.rs
+1 −91		tests/testsuite/cross_compile.rs
+3 −3		tests/testsuite/freshness.rs
+0 −211		tests/testsuite/plugins.rs
+1 −1		Cargo.lock
+1 −1		Cargo.toml
+7 −4		src/modules.rs
+4 −77		src/syntux/parser.rs