diff options
| author | bors <bors@rust-lang.org> | 2024-04-09 17:19:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-09 17:19:15 +0000 |
| commit | 25ef9e3d85d934b27d9dada2f9dd52b1dc63bb04 (patch) | |
| tree | b4cc32646e9144cad1fbec590ff6c88e6fa7846e /src | |
| parent | 7cf61ebde7b22796c69757901dd346d0fe70bd97 (diff) | |
| parent | e7b09f5bf6a8d71c391713cd55935a9468009d52 (diff) | |
| download | rust-1.77.2.tar.gz rust-1.77.2.zip | |
Auto merge of #123681 - pietroalbini:pa-cve-2024-24576-stable, r=pietroalbini 1.77.2
[stable] Prepare Rust 1.77.2 See https://blog.rust-lang.org/2024/04/09/cve-2024-24576.html
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/scripts/install-ninja.sh | 2 | ||||
| -rw-r--r-- | src/tools/tidy/src/ui_tests.rs | 3 | ||||
| -rw-r--r-- | src/version | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/ci/scripts/install-ninja.sh b/src/ci/scripts/install-ninja.sh index 5145a03e353..23cbc2eb6d1 100755 --- a/src/ci/scripts/install-ninja.sh +++ b/src/ci/scripts/install-ninja.sh @@ -8,7 +8,7 @@ source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" if isWindows; then mkdir ninja - curl -o ninja.zip "${MIRRORS_BASE}/2017-03-15-ninja-win.zip" + curl -o ninja.zip "${MIRRORS_BASE}/2024-03-28-v1.11.1-ninja-win.zip" 7z x -oninja ninja.zip rm ninja.zip ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja" diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 451276b5ac1..1538a1b8d51 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -43,6 +43,9 @@ const EXTENSION_EXCEPTION_PATHS: &[&str] = &[ "tests/ui/shell-argfiles/shell-argfiles-badquotes.args", // passing args via a file "tests/ui/shell-argfiles/shell-argfiles-via-argfile-shell.args", // passing args via a file "tests/ui/shell-argfiles/shell-argfiles-via-argfile.args", // passing args via a file + "tests/ui/std/windows-bat-args1.bat", // tests escaping arguments through batch files + "tests/ui/std/windows-bat-args2.bat", // tests escaping arguments through batch files + "tests/ui/std/windows-bat-args3.bat", // tests escaping arguments through batch files ]; fn check_entries(tests_path: &Path, bad: &mut bool) { diff --git a/src/version b/src/version index b1131583c67..369f9966f67 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.77.1 +1.77.2 |