From 14b8f9aa68db1f6c13f68b4346bc7e1e89f45cf7 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 25 Jan 2022 12:03:33 -0800
Subject: [PATCH 1/4] [beta] Update cargo
---
src/tools/cargo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/cargo b/src/tools/cargo
index 2e4932801996a..5ad495c6839f3 160000
--- a/src/tools/cargo
+++ b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 2e4932801996a8799be8648a8858701e1ee8697a
+Subproject commit 5ad495c6839f34ead56177829575da443d3e01d0
From 9f7c5dce21e0e17833ff6da4800ce1211aca02de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Thu, 20 Jan 2022 23:37:43 +0100
Subject: [PATCH 2/4] Rollup merge of #93128 -
pietroalbini:pa-verify-stable-version-number, r=Mark-Simulacrum
Add script to prevent point releases with same number as existing ones
This will hopefully prevent what happened today with #93110 and #93121, where we built point release artifacts without changing version numbers, thus requiring another PR to change the version number.
r? `@Mark-Simulacrum`
---
.github/workflows/ci.yml | 9 ++++++
src/ci/github-actions/ci.yml | 4 +++
.../scripts/verify-stable-version-number.sh | 30 +++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 100755 src/ci/scripts/verify-stable-version-number.sh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67deb3d977942..88817043833a9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,6 +128,9 @@ jobs:
- name: ensure backported commits are in upstream branches
run: src/ci/scripts/verify-backported-commits.sh
if: success() && !env.SKIP_JOB
+ - name: ensure the stable version number is correct
+ run: src/ci/scripts/verify-stable-version-number.sh
+ if: success() && !env.SKIP_JOB
- name: run the build
run: src/ci/scripts/run-build-from-ci.sh
env:
@@ -502,6 +505,9 @@ jobs:
- name: ensure backported commits are in upstream branches
run: src/ci/scripts/verify-backported-commits.sh
if: success() && !env.SKIP_JOB
+ - name: ensure the stable version number is correct
+ run: src/ci/scripts/verify-stable-version-number.sh
+ if: success() && !env.SKIP_JOB
- name: run the build
run: src/ci/scripts/run-build-from-ci.sh
env:
@@ -612,6 +618,9 @@ jobs:
- name: ensure backported commits are in upstream branches
run: src/ci/scripts/verify-backported-commits.sh
if: success() && !env.SKIP_JOB
+ - name: ensure the stable version number is correct
+ run: src/ci/scripts/verify-stable-version-number.sh
+ if: success() && !env.SKIP_JOB
- name: run the build
run: src/ci/scripts/run-build-from-ci.sh
env:
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index ac5d5822bfbd5..4f9909e25c46f 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -206,6 +206,10 @@ x--expand-yaml-anchors--remove:
run: src/ci/scripts/verify-backported-commits.sh
<<: *step
+ - name: ensure the stable version number is correct
+ run: src/ci/scripts/verify-stable-version-number.sh
+ <<: *step
+
- name: run the build
run: src/ci/scripts/run-build-from-ci.sh
env:
diff --git a/src/ci/scripts/verify-stable-version-number.sh b/src/ci/scripts/verify-stable-version-number.sh
new file mode 100755
index 0000000000000..82eb3833ccf98
--- /dev/null
+++ b/src/ci/scripts/verify-stable-version-number.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# On the stable channel, check whether we're trying to build artifacts with the
+# same version number of a release that's already been published, and fail the
+# build if that's the case.
+#
+# It's a mistake whenever that happens: the release process won't start if it
+# detects a duplicate version number, and the artifacts would have to be
+# rebuilt anyway.
+
+set -euo pipefail
+IFS=$'\n\t'
+
+if [[ "$(cat src/ci/channel)" != "stable" ]]; then
+ echo "This script only works on the stable channel. Skipping the check."
+ exit 0
+fi
+
+version="$(cat src/version)"
+url="https://static.rust-lang.org/dist/channel-rust-${version}.toml"
+
+if curl --silent --fail "${url}" >/dev/null; then
+ echo "The version number ${version} matches an existing release."
+ echo
+ echo "If you're trying to prepare a point release, remember to change the"
+ echo "version number in the src/version file."
+ exit 1
+else
+ echo "The version number ${version} does not match any released version!"
+ exit 0
+fi
From e5e539c0de27132a2a997c33f019282c93692e3c Mon Sep 17 00:00:00 2001
From: bors <bors@rust-lang.org>
Date: Mon, 24 Jan 2022 11:20:01 +0000
Subject: [PATCH 3/4] Auto merge of #93014 -
Kobzol:revert-92103-stable-hash-skip-zero-bytes, r=the8472
Revert "Do not hash leading zero bytes of i64 numbers in Sip128 hasher"
Reverts rust-lang/rust#92103. It had a (in retrospect, obvious) correctness problem where changing the order of two adjacent values would produce identical hashes, which is problematic in stable hashing (see [this comment](https://github.com/rust-lang/rust/pull/92103#issuecomment-1014625442)).
I'll try to send the PR again with a fix for this issue.
r? `@the8472`
---
compiler/rustc_data_structures/src/sip128.rs | 18 ++----------------
src/test/debuginfo/function-names.rs | 4 ++--
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/compiler/rustc_data_structures/src/sip128.rs b/compiler/rustc_data_structures/src/sip128.rs
index 872b0eb7854ae..53062b9c20da8 100644
--- a/compiler/rustc_data_structures/src/sip128.rs
+++ b/compiler/rustc_data_structures/src/sip128.rs
@@ -409,20 +409,6 @@ impl SipHasher128 {
}
}
-macro_rules! dispatch_value {
- ($target: expr, $value:expr) => {
- let value = $value;
- #[allow(unreachable_patterns)]
- #[allow(overflowing_literals)]
- match value {
- 0..=0xFF => $target.short_write(value as u8),
- 0x100..=0xFFFF => $target.short_write(value as u16),
- 0x10000..=0xFFFFFFFF => $target.short_write(value as u32),
- _ => $target.short_write(value as u64),
- }
- };
-}
-
impl Hasher for SipHasher128 {
#[inline]
fn write_u8(&mut self, i: u8) {
@@ -436,7 +422,7 @@ impl Hasher for SipHasher128 {
#[inline]
fn write_u32(&mut self, i: u32) {
- dispatch_value!(self, i);
+ self.short_write(i);
}
#[inline]
@@ -466,7 +452,7 @@ impl Hasher for SipHasher128 {
#[inline]
fn write_i64(&mut self, i: i64) {
- dispatch_value!(self, i as u64);
+ self.short_write(i as u64);
}
#[inline]
diff --git a/src/test/debuginfo/function-names.rs b/src/test/debuginfo/function-names.rs
index ac9a02cce0481..61d5fc93cd2ad 100644
--- a/src/test/debuginfo/function-names.rs
+++ b/src/test/debuginfo/function-names.rs
@@ -37,7 +37,7 @@
// Const generic parameter
// gdb-command:info functions -q function_names::const_generic_fn.*
// gdb-check:[...]static fn function_names::const_generic_fn_bool<false>();
-// gdb-check:[...]static fn function_names::const_generic_fn_non_int<{CONST#3fcd7c34c1555be6}>();
+// gdb-check:[...]static fn function_names::const_generic_fn_non_int<{CONST#fe3cfa0214ac55c7}>();
// gdb-check:[...]static fn function_names::const_generic_fn_signed_int<-7>();
// gdb-check:[...]static fn function_names::const_generic_fn_unsigned_int<14>();
@@ -76,7 +76,7 @@
// Const generic parameter
// cdb-command:x a!function_names::const_generic_fn*
// cdb-check:[...] a!function_names::const_generic_fn_bool<false> (void)
-// cdb-check:[...] a!function_names::const_generic_fn_non_int<CONST$3fcd7c34c1555be6> (void)
+// cdb-check:[...] a!function_names::const_generic_fn_non_int<CONST$fe3cfa0214ac55c7> (void)
// cdb-check:[...] a!function_names::const_generic_fn_unsigned_int<14> (void)
// cdb-check:[...] a!function_names::const_generic_fn_signed_int<-7> (void)
From c67845871d79f4451c517741dde980b783d66a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Sat, 22 Jan 2022 15:32:50 +0100
Subject: [PATCH 4/4] Rollup merge of #93012 - GuillaumeGomez:pulldown-list,
r=camelid
Update pulldown-cmark version to fix markdown list issue
Fixes #92971.
r? ```@camelid```
---
Cargo.lock | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0a29c05822668..2abf190a5eaa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -617,7 +617,7 @@ dependencies = [
"clippy_utils",
"if_chain",
"itertools 0.10.1",
- "pulldown-cmark 0.9.0",
+ "pulldown-cmark",
"quine-mc_cluskey",
"regex-syntax",
"rustc-semver",
@@ -2154,9 +2154,9 @@ dependencies = [
[[package]]
name = "mdbook"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e77253c46a90eb7e96b2807201dab941a4db5ea05eca5aaaf7027395f352b3"
+checksum = "241f10687eb3b4e0634b3b4e423f97c5f1efbd69dc9522e24a8b94583eeec3c6"
dependencies = [
"ammonia",
"anyhow",
@@ -2169,7 +2169,7 @@ dependencies = [
"log",
"memchr",
"opener",
- "pulldown-cmark 0.8.0",
+ "pulldown-cmark",
"regex",
"serde",
"serde_derive",
@@ -2808,9 +2808,9 @@ dependencies = [
[[package]]
name = "pulldown-cmark"
-version = "0.8.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
+checksum = "34f197a544b0c9ab3ae46c359a7ec9cbbb5c7bf97054266fecb7ead794a181d6"
dependencies = [
"bitflags",
"getopts",
@@ -2818,17 +2818,6 @@ dependencies = [
"unicase",
]
-[[package]]
-name = "pulldown-cmark"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd16514d1af5f7a71f909a44ef253cdb712a376d7ebc8ae4a471a9be9743548"
-dependencies = [
- "bitflags",
- "memchr",
- "unicase",
-]
-
[[package]]
name = "punycode"
version = "0.4.1"
@@ -4634,7 +4623,7 @@ dependencies = [
"expect-test",
"itertools 0.9.0",
"minifier",
- "pulldown-cmark 0.9.0",
+ "pulldown-cmark",
"rayon",
"regex",
"rustdoc-json-types",