Auto merge of #71868 - Mark-Simulacrum:stable-1.43.1, r=pietroalbini
[stable] 1.43.1 release
* [Updated openssl-src to 1.1.1g for CVE-2020-1967.][71430]
* [Fixed the stabilization of AVX-512 features.][71473]
* [Fixed `cargo package --list` not working with unpublished dependencies.][cargo/8151]
[71430]: https://github.com/rust-lang/rust/pull/71430
[71473]: https://github.com/rust-lang/rust/issues/71473
[cargo/8151]: https://github.com/rust-lang/cargo/issues/8151
diff --git a/Cargo.lock b/Cargo.lock
index d41517c..ee44765 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2249,9 +2249,9 @@
[[package]]
name = "openssl-src"
-version = "111.6.1+1.1.1d"
+version = "111.9.0+1.1.1g"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
+checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4"
dependencies = [
"cc",
]
diff --git a/RELEASES.md b/RELEASES.md
index 36597b1..8ea481f 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,3 +1,15 @@
+Version 1.43.1 (2020-05-07)
+===========================
+
+* [Updated openssl-src to 1.1.1g for CVE-2020-1967.][71430]
+* [Fixed the stabilization of AVX-512 features.][71473]
+* [Fixed `cargo package --list` not working with unpublished dependencies.][cargo/8151]
+
+[71430]: https://github.com/rust-lang/rust/pull/71430
+[71473]: https://github.com/rust-lang/rust/issues/71473
+[cargo/8151]: https://github.com/rust-lang/cargo/issues/8151
+
+
Version 1.43.0 (2020-04-23)
==========================
@@ -14,7 +26,7 @@
- [Merge `fn` syntax + cleanup item parsing.][68728]
- [`item` macro fragments can be interpolated into `trait`s, `impl`s, and `extern` blocks.][69366]
For example, you may now write:
- ```rust
+ ```rust
macro_rules! mac_trait {
($i:item) => {
trait T { $i }
@@ -82,7 +94,7 @@
- [Certain checks in the `const_err` lint were deemed unrelated to const
evaluation][69185], and have been moved to the `unconditional_panic` and
`arithmetic_overflow` lints.
-
+
Compatibility Notes
-------------------
@@ -173,7 +185,7 @@
(e.g. `type Foo: Ord;`).
- `...` (the C-variadic type) may occur syntactically directly as the type of
any function parameter.
-
+
These are still rejected *semantically*, so you will likely receive an error
but these changes can be seen and parsed by procedural macros and
conditional compilation.
@@ -465,7 +477,7 @@
- [Using `#[inline]` on function prototypes and consts now emits a warning under
`unused_attribute` lint.][65294] Using `#[inline]` anywhere else inside traits
or `extern` blocks now correctly emits a hard error.
-
+
[65294]: https://github.com/rust-lang/rust/pull/65294/
[66103]: https://github.com/rust-lang/rust/pull/66103/
[65843]: https://github.com/rust-lang/rust/pull/65843/
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 504cba4..47fec8d 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -13,7 +13,7 @@
use crate::Build;
// The version number
-pub const CFG_RELEASE_NUM: &str = "1.43.0";
+pub const CFG_RELEASE_NUM: &str = "1.43.1";
pub struct GitInfo {
inner: Option<Info>,
diff --git a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh
index 3354a79..9db1f6e 100755
--- a/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh
+++ b/src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh
@@ -33,7 +33,8 @@
# Install the C++ runtime libraries from CloudABI Ports.
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15
-add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi'
+add-apt-repository -y \
+ 'deb https://ci-mirrors.rust-lang.org/rustc/2020-05-04-cloudabi-apt-archive/ cloudabi cloudabi'
apt-get update
apt-get install -y "${target//_/-}-cxx-runtime"
diff --git a/src/libcore/internal_macros.rs b/src/libcore/internal_macros.rs
index 4ea7dfc..8304a67 100644
--- a/src/libcore/internal_macros.rs
+++ b/src/libcore/internal_macros.rs
@@ -117,3 +117,9 @@
)+
}
}
+
+#[allow(unused_macros)]
+macro_rules! llvm_asm {
+ // Redirect to asm! for stdarch in stable 1.43
+ ($($arg:tt)*) => { $crate::asm!($($arg)*) }
+}
diff --git a/src/stdarch b/src/stdarch
index abe96ca..d10eefc 160000
--- a/src/stdarch
+++ b/src/stdarch
@@ -1 +1 @@
-Subproject commit abe96ca3b87fcca6aa1dfcefd40d8c8d92d2e673
+Subproject commit d10eefc62284c40c5a95a2eed19fc1f414a5364d
diff --git a/src/tools/cargo b/src/tools/cargo
index 3532cf7..2cbe904 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 3532cf738db005a56d1fe81ade514f380d411360
+Subproject commit 2cbe9048efc5c904b33191d799f97dc4698debaa
