Skip to content

test new solver on CI until stabilization #156146

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

Open
lqd wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −5
Open

test new solver on CI until stabilization #156146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b70a6f
test new solver on CI until stabilization
lqd May 4, 2026
0512079
work around const Iterator failure with new solver
lqd May 4, 2026
f243f57
fix comment
lqd May 7, 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 compiler/rustc_next_trait_solver/src/solve/effect_goals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ where
_ecx: &mut EvalCtxt<'_, D>,
_goal: Goal<I, Self>,
) -> Result<Candidate<I>, NoSolutionOrRerunNonErased> {
todo!("Iterator is not yet const")
Err(NoSolutionOrRerunNonErased::NoSolution(NoSolution))
}

fn consider_builtin_fused_iterator_candidate(
Expand Down
10 changes: 6 additions & 4 deletions src/ci/docker/scripts/x86_64-gnu-llvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ set -ex
# despite having different output on 32-bit vs 64-bit targets.
../x --stage 2 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu

# Run the UI test suite again, but in `--pass=check` mode
#
# This is intended to make sure that both `--pass=check` continues to
# work.
# Run the UI test suite in `--pass=check` mode, to ensure it continues to work.
Copy link
Copy Markdown
Member Author

@lqd lqd May 7, 2026 •
edited by rustbot
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing this comment made me realize running the mir-opt tests and --pass=check is duplicated in this job and in the llvm-2 jobs here

rust/src/ci/docker/scripts/x86_64-gnu-llvm2.sh

Lines 9 to 21 in 0e5924a

# Run the `mir-opt` tests again but this time for a 32-bit target.
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
# both 32-bit and 64-bit outputs updated by the PR author, before
# the PR is approved and tested for merging.
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
# despite having different output on 32-bit vs 64-bit targets.
../x --stage 2 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu
# Run the UI test suite again, but in `--pass=check` mode
#
# This is intended to make sure that both `--pass=check` continues to
# work.
../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu

So we could slightly optimize either job by removing these two tasks. I could also do that in another PR if you want?

View changes since the review

../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu

# Rebuild the stdlib using the new trait solver, to ensure it doesn't regress
# until stabilization.
RUSTFLAGS_NOT_BOOTSTRAP="-Znext-solver=globally" ../x --stage 1 build library \
--host='' --target=i686-unknown-linux-gnu
Loading