From acc7e1c8eace650839c872232e3cd825487971f5 Mon Sep 17 00:00:00 2001 From: Alex Macleod Date: Sun, 19 Jan 2025 11:58:32 +0000 Subject: change `literal_string_with_formatting_args` lint category to nursery (#14014) This PR changes literal_string_with_formatting_args category from `suspicious` to `nursery` since there are thousands of false positive on GitHub. Closes #13989 since it's no longer problematic with such false positive with ~~`pedantic`~~ `nursery` category. changelog: [`literal_string_with_formatting_args` ] change category to `nursery` from `suspicious` --- .../clippy/clippy_lints/src/literal_string_with_formatting_args.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/tools/clippy/clippy_lints/src/literal_string_with_formatting_args.rs b/src/tools/clippy/clippy_lints/src/literal_string_with_formatting_args.rs index 49353a1b76b..2d8c1e492fb 100644 --- a/src/tools/clippy/clippy_lints/src/literal_string_with_formatting_args.rs +++ b/src/tools/clippy/clippy_lints/src/literal_string_with_formatting_args.rs @@ -31,7 +31,7 @@ declare_clippy_lint! { /// ``` #[clippy::version = "1.83.0"] pub LITERAL_STRING_WITH_FORMATTING_ARGS, - suspicious, + nursery, "Checks if string literals have formatting arguments" } -- cgit 1.4.1-3-g733a5 From 13c3ebbc9da038a97a34488081fd193d452d6c49 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 17 Feb 2025 08:27:47 -0800 Subject: Update the reference for reverted `extended_varargs_abi_support` --- src/doc/reference | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/reference b/src/doc/reference index acd6794e712..b05d56e8dfa 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit acd6794e712d5e2ef6f5c84fb95688d32a69b816 +Subproject commit b05d56e8dfab65ac842b898ccdac5cd61c163556 -- cgit 1.4.1-3-g733a5 From 792e9c74c3d35245848621b770887b882b91a430 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sun, 16 Feb 2025 12:21:42 +0100 Subject: fix musl's CVE-2025-26519 (cherry picked from commit a6ee2f4af223ff7636c5d55c735fd5bb51c8578f) --- src/ci/docker/scripts/musl.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'src') diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index ece8e6c15c0..9878bec6fbe 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -30,6 +30,47 @@ MUSL=musl-1.2.3 # may have been downloaded in a previous run if [ ! -d $MUSL ]; then curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf - + + # Apply patches for CVE-2025-26519. At the time of adding these patches no release containing them + # has been published by the musl project, so we just apply them directly on top of the version we + # were distributing already. The patches should be removed once we upgrade to musl >= 1.2.6. + # + # Advisory: https://www.openwall.com/lists/musl/2025/02/13/1 + # + # Patches applied: + # - https://www.openwall.com/lists/musl/2025/02/13/1/1 + # - https://www.openwall.com/lists/musl/2025/02/13/1/2 + # + # ignore-tidy-tab + # ignore-tidy-linelength + patch -p1 -d $MUSL <= 93 || d >= 94) { + c += (0xa1-0x81); + d += 0xa1; +- if (c >= 93 || c>=0xc6-0x81 && d>0x52) ++ if (c > 0xc6-0x81 || c==0xc6-0x81 && d>0x52) + goto ilseq; + if (d-'A'<26) d = d-'A'; + else if (d-'a'<26) d = d-'a'+26; +EOF + patch -p1 -d $MUSL <4) goto ilseq; + *out += k; + *outb -= k; + break; +EOF fi cd $MUSL -- cgit 1.4.1-3-g733a5 From 1d56b49cac3e502095c933bf8155b0ac90a5f796 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 17 Feb 2025 09:01:56 -0800 Subject: bump channel to stable --- src/ci/channel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ci/channel b/src/ci/channel index 65b2df87f7d..2bf5ad0447d 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -beta +stable -- cgit 1.4.1-3-g733a5 From d5a78fbeaede3838588cefbcff83c7a68795a487 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 6 Jan 2025 20:13:30 +0100 Subject: Revert "add new CI step: "setup upstream remote"" This reverts commit 4454fa998c9da1f1eee1602c8e8cd2732505c104. (cherry picked from commit 395fb701e74f58e6c77e2cbdc1967478924e819f) --- .github/workflows/ci.yml | 3 --- src/ci/scripts/setup-upstream-remote.sh | 24 ------------------------ src/ci/shared.sh | 12 ------------ 3 files changed, 39 deletions(-) delete mode 100755 src/ci/scripts/setup-upstream-remote.sh (limited to 'src') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0e151d2577..5c78ac2816c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,9 +130,6 @@ jobs: # which then uses log commands to actually set them. EXTRA_VARIABLES: ${{ toJson(matrix.env) }} - - name: setup upstream remote - run: src/ci/scripts/setup-upstream-remote.sh - - name: ensure the channel matches the target branch run: src/ci/scripts/verify-channel.sh diff --git a/src/ci/scripts/setup-upstream-remote.sh b/src/ci/scripts/setup-upstream-remote.sh deleted file mode 100755 index 52b4c98a890..00000000000 --- a/src/ci/scripts/setup-upstream-remote.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# In CI environments, bootstrap is forced to use the remote upstream based -# on "git_repository" and "nightly_branch" values from src/stage0 file. -# This script configures the remote as it may not exist by default. - -set -euo pipefail -IFS=$'\n\t' - -ci_dir=$(cd $(dirname $0) && pwd)/.. -source "$ci_dir/shared.sh" - -git_repository=$(parse_stage0_file_by_key "git_repository") -nightly_branch=$(parse_stage0_file_by_key "nightly_branch") - -# Configure "rust-lang/rust" upstream remote only when it's not origin. -if [ -z "$(git config remote.origin.url | grep $git_repository)" ]; then - echo "Configuring https://github.com/$git_repository remote as upstream." - git remote add upstream "https://github.com/$git_repository" - REMOTE_NAME="upstream" -else - REMOTE_NAME="origin" -fi - -git fetch $REMOTE_NAME $nightly_branch diff --git a/src/ci/shared.sh b/src/ci/shared.sh index 9fce68947f4..76464add75d 100644 --- a/src/ci/shared.sh +++ b/src/ci/shared.sh @@ -137,15 +137,3 @@ function releaseChannel { echo $RUST_CI_OVERRIDE_RELEASE_CHANNEL fi } - -# Parse values from src/stage0 file by key -function parse_stage0_file_by_key { - local key="$1" - local file="$ci_dir/../stage0" - local value=$(awk -F= '{a[$1]=$2} END {print(a["'$key'"])}' $file) - if [ -z "$value" ]; then - echo "ERROR: Key '$key' not found in '$file'." - exit 1 - fi - echo "$value" -} -- cgit 1.4.1-3-g733a5 From 86193fa8a04bcbdeee9917c2a2d1e2ea7054c0a6 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 6 Jan 2025 20:13:40 +0100 Subject: Revert "force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment" This reverts commit 33ac202904e7820268b71b3280a7d2590378e3b9. (cherry picked from commit 6287749471076a3065a5793cb0a1678324e768bb) --- src/build_helper/src/git.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs index 2aad5650fa8..1e28d552fe6 100644 --- a/src/build_helper/src/git.rs +++ b/src/build_helper/src/git.rs @@ -1,8 +1,6 @@ use std::path::{Path, PathBuf}; use std::process::{Command, Stdio}; -use crate::ci::CiEnv; - pub struct GitConfig<'a> { pub git_repository: &'a str, pub nightly_branch: &'a str, @@ -116,8 +114,8 @@ fn git_upstream_merge_base( /// Searches for the nearest merge commit in the repository that also exists upstream. /// -/// It looks for the most recent commit made by the merge bot by matching the author's email -/// address with the merge bot's email. +/// If it fails to find the upstream remote, it then looks for the most recent commit made +/// by the merge bot by matching the author's email address with the merge bot's email. pub fn get_closest_merge_commit( git_dir: Option<&Path>, config: &GitConfig<'_>, @@ -129,15 +127,7 @@ pub fn get_closest_merge_commit( git.current_dir(git_dir); } - let merge_base = { - if CiEnv::is_ci() { - git_upstream_merge_base(config, git_dir).unwrap() - } else { - // For non-CI environments, ignore rust-lang/rust upstream as it usually gets - // outdated very quickly. - "HEAD".to_string() - } - }; + let merge_base = git_upstream_merge_base(config, git_dir).unwrap_or_else(|_| "HEAD".into()); git.args([ "rev-list", -- cgit 1.4.1-3-g733a5