Skip to content

[beta] backports #151270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 4 commits into from
Jan 18, 2026
+493 −674
Merged

[beta] backports #151270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8201d3
Remove references to bors2
Kobzol Jan 11, 2026
4c28b43
Revert bors email to the original homu one
Kobzol Jan 11, 2026
2b8a999
Use both bors e-mails for CI postprocessing git lookup
Kobzol Jan 11, 2026
6feceec
Disable SimplifyComparisonIntegral
saethlin Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ jobs:
fi

# Get closest bors merge commit
PARENT_COMMIT=`git rev-list --author='bors <bors@rust-lang.org>' -n1 --first-parent HEAD^1`
PARENT_COMMIT=`git rev-list --author='[email protected]' --author='122020455+rust-bors\[bot\]@users.noreply.github.com' -n1 --first-parent HEAD^1`

./build/citool/debug/citool postprocess-metrics \
--job-name ${CI_JOB_NAME} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
sleep 60

# Get closest bors merge commit
PARENT_COMMIT=`git rev-list --author='122020455+rust-bors\[bot\]@users.noreply.github.com' -n1 --first-parent HEAD^1`
PARENT_COMMIT=`git rev-list --author='[email protected]' --author='122020455+rust-bors\[bot\]@users.noreply.github.com' -n1 --first-parent HEAD^1`
echo "Parent: ${PARENT_COMMIT}"

# Find PR for the current commit
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_mir_transform/src/simplify_comparison_integral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub(super) struct SimplifyComparisonIntegral;

impl<'tcx> crate::MirPass<'tcx> for SimplifyComparisonIntegral {
fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
sess.mir_opt_level() > 0
sess.mir_opt_level() > 0 && sess.opts.unstable_opts.unsound_mir_opts
}

fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
Expand Down
19 changes: 10 additions & 9 deletions src/build_helper/src/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,10 @@ pub fn has_changed_since(git_dir: &Path, base: &str, paths: &[&str]) -> bool {
})
}

const LEGACY_BORS_EMAIL: &str = "[email protected]";
// Temporary e-mail used by new bors for merge commits for a few days, until it learned how to reuse
// the original homu e-mail
// FIXME: remove in Q2 2026
const TEMPORARY_BORS_EMAIL: &str = "122020455+rust-bors[bot]@users.noreply.github.com";

/// Escape characters from the git user e-mail, so that git commands do not interpret it as regex
/// special characters.
Expand Down Expand Up @@ -193,10 +196,9 @@ fn get_latest_upstream_commit_that_modified_files(
&escape_email_git_regex(git_config.git_merge_commit_email),
]);

// Also search for legacy bors account, before we accrue enough commits to
// have changes to all relevant file paths done by new bors.
if git_config.git_merge_commit_email != LEGACY_BORS_EMAIL {
git.args(["--author", LEGACY_BORS_EMAIL]);
// Also search for temporary bors account
if git_config.git_merge_commit_email != TEMPORARY_BORS_EMAIL {
git.args(["--author", &escape_email_git_regex(TEMPORARY_BORS_EMAIL)]);
}

if !target_paths.is_empty() {
Expand Down Expand Up @@ -248,10 +250,9 @@ pub fn get_closest_upstream_commit(
base,
]);

// Also search for legacy bors account, before we accrue enough commits to
// have changes to all relevant file paths done by new bors.
if config.git_merge_commit_email != LEGACY_BORS_EMAIL {
git.args(["--author", LEGACY_BORS_EMAIL]);
// Also search for temporary bors account
if config.git_merge_commit_email != TEMPORARY_BORS_EMAIL {
git.args(["--author", &escape_email_git_regex(TEMPORARY_BORS_EMAIL)]);
}

let output = output_result(&mut git)?.trim().to_owned();
Expand Down
4 changes: 2 additions & 2 deletions src/ci/github-actions/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ try:
- <<: *job-dist-x86_64-linux

# Jobs that only run when explicitly invoked in one of the following ways:
# - comment `@bors2 try jobs=<job-name>`
# - `try-job: <job-name>` in the PR description and comment `@bors try` or `@bors2 try`.
# - comment `@bors try jobs=<job-name>`
# - `try-job: <job-name>` in the PR description and comment `@bors try`.
optional:
# This job is used just to test optional jobs.
# It will be replaced by tier 2 and tier 3 jobs in the future.
Expand Down
2 changes: 1 addition & 1 deletion src/stage0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist_server=https://static.rust-lang.org
artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds
artifacts_with_llvm_assertions_server=https://ci-artifacts.rust-lang.org/rustc-builds-alt
git_merge_commit_email=122020455+rust-bors[bot]@users.noreply.github.com
git_merge_commit_email=bors@rust-lang.org
nightly_branch=main

# The configuration above this comment is editable, and can be changed
Expand Down
2 changes: 1 addition & 1 deletion tests/codegen-llvm/hint/likely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn test4(x: u64) {
}

// CHECK-LABEL: @test4(
// CHECK: br i1 %0, label %bb3, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: br i1 %_2.not, label %bb3, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: bb3:
// CHECK: path_a
// CHECK: bb2:
Expand Down
2 changes: 1 addition & 1 deletion tests/codegen-llvm/hint/unlikely.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub fn test4(x: u64) {
}

// CHECK-LABEL: @test4(
// CHECK: br i1 %0, label %bb4, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: br i1 %_2.not, label %bb4, label %bb2, !prof ![[NUM2:[0-9]+]]
// CHECK: bb4:
// CHECK: path_a
// CHECK: bb2:
Expand Down
2 changes: 1 addition & 1 deletion tests/debuginfo/dummy_span.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//@ min-lldb-version: 310

//@ compile-flags:-g
//@ compile-flags:-g -Zunsound-mir-opts
//@ ignore-backends: gcc

// === GDB TESTS ===================================================================================
Expand Down
44 changes: 24 additions & 20 deletions tests/mir-opt/funky_arms.float_to_exponential_common.GVN.32bit.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
debug precision => _8;
let _8: usize;
scope 5 (inlined Formatter::<'_>::precision) {
let mut _22: u32;
let mut _22: bool;
let mut _23: u32;
let mut _24: usize;
let mut _25: u16;
let mut _24: u32;
let mut _25: usize;
let mut _26: u16;
}
}
}
Expand Down Expand Up @@ -71,10 +72,12 @@
StorageLive(_6);
StorageLive(_22);
StorageLive(_23);
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_23);
switchInt(move _22) -> [0: bb10, otherwise: bb11];
StorageLive(_24);
_24 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_23 = BitAnd(move _24, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_24);
_22 = Eq(move _23, const 0_u32);
switchInt(move _22) -> [0: bb10, otherwise: bb9];
}

bb4: {
Expand Down Expand Up @@ -142,26 +145,27 @@
}

bb9: {
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
StorageDead(_23);
_6 = const Option::<usize>::None;
goto -> bb11;
}

bb10: {
StorageDead(_22);
_6 = const Option::<usize>::None;
goto -> bb9;
StorageDead(_23);
StorageLive(_25);
StorageLive(_26);
_26 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_25 = move _26 as usize (IntToInt);
StorageDead(_26);
_6 = Option::<usize>::Some(move _25);
StorageDead(_25);
goto -> bb11;
}

bb11: {
StorageDead(_22);
StorageLive(_24);
StorageLive(_25);
_25 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_24 = move _25 as usize (IntToInt);
StorageDead(_25);
_6 = Option::<usize>::Some(move _24);
StorageDead(_24);
goto -> bb9;
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
}

bb12: {
Expand Down
44 changes: 24 additions & 20 deletions tests/mir-opt/funky_arms.float_to_exponential_common.GVN.32bit.panic-unwind.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
debug precision => _8;
let _8: usize;
scope 5 (inlined Formatter::<'_>::precision) {
let mut _22: u32;
let mut _22: bool;
let mut _23: u32;
let mut _24: usize;
let mut _25: u16;
let mut _24: u32;
let mut _25: usize;
let mut _26: u16;
}
}
}
Expand Down Expand Up @@ -71,10 +72,12 @@
StorageLive(_6);
StorageLive(_22);
StorageLive(_23);
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_23);
switchInt(move _22) -> [0: bb10, otherwise: bb11];
StorageLive(_24);
_24 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_23 = BitAnd(move _24, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_24);
_22 = Eq(move _23, const 0_u32);
switchInt(move _22) -> [0: bb10, otherwise: bb9];
}

bb4: {
Expand Down Expand Up @@ -142,26 +145,27 @@
}

bb9: {
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
StorageDead(_23);
_6 = const Option::<usize>::None;
goto -> bb11;
}

bb10: {
StorageDead(_22);
_6 = const Option::<usize>::None;
goto -> bb9;
StorageDead(_23);
StorageLive(_25);
StorageLive(_26);
_26 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_25 = move _26 as usize (IntToInt);
StorageDead(_26);
_6 = Option::<usize>::Some(move _25);
StorageDead(_25);
goto -> bb11;
}

bb11: {
StorageDead(_22);
StorageLive(_24);
StorageLive(_25);
_25 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_24 = move _25 as usize (IntToInt);
StorageDead(_25);
_6 = Option::<usize>::Some(move _24);
StorageDead(_24);
goto -> bb9;
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
}

bb12: {
Expand Down
44 changes: 24 additions & 20 deletions tests/mir-opt/funky_arms.float_to_exponential_common.GVN.64bit.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
debug precision => _8;
let _8: usize;
scope 5 (inlined Formatter::<'_>::precision) {
let mut _22: u32;
let mut _22: bool;
let mut _23: u32;
let mut _24: usize;
let mut _25: u16;
let mut _24: u32;
let mut _25: usize;
let mut _26: u16;
}
}
}
Expand Down Expand Up @@ -71,10 +72,12 @@
StorageLive(_6);
StorageLive(_22);
StorageLive(_23);
_23 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_22 = BitAnd(move _23, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_23);
switchInt(move _22) -> [0: bb10, otherwise: bb11];
StorageLive(_24);
_24 = copy (((*_1).0: std::fmt::FormattingOptions).0: u32);
_23 = BitAnd(move _24, const core::fmt::flags::PRECISION_FLAG);
StorageDead(_24);
_22 = Eq(move _23, const 0_u32);
switchInt(move _22) -> [0: bb10, otherwise: bb9];
}

bb4: {
Expand Down Expand Up @@ -142,26 +145,27 @@
}

bb9: {
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
StorageDead(_23);
_6 = const Option::<usize>::None;
goto -> bb11;
}

bb10: {
StorageDead(_22);
_6 = const Option::<usize>::None;
goto -> bb9;
StorageDead(_23);
StorageLive(_25);
StorageLive(_26);
_26 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_25 = move _26 as usize (IntToInt);
StorageDead(_26);
_6 = Option::<usize>::Some(move _25);
StorageDead(_25);
goto -> bb11;
}

bb11: {
StorageDead(_22);
StorageLive(_24);
StorageLive(_25);
_25 = copy (((*_1).0: std::fmt::FormattingOptions).2: u16);
_24 = move _25 as usize (IntToInt);
StorageDead(_25);
_6 = Option::<usize>::Some(move _24);
StorageDead(_24);
goto -> bb9;
_7 = discriminant(_6);
switchInt(move _7) -> [1: bb4, 0: bb6, otherwise: bb12];
}

bb12: {
Expand Down
Loading
Loading