Skip to content

compiletest: Fix the edition of minicore to the latest stable one - #165483

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
fmease:comptest-fixate-minicore-edition
Nov 5, 2026
Merged

rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
fmease:comptest-fixate-minicore-edition

Conversation

@fmease

@fmease fmease commented Nov 5, 2026 •

Copy link
Copy Markdown
Member

...instead of using whatever edition the dependent / the reverse dependency is using (!).

Context: #165479 (comment).

Unblocks PR #165487.

r? @jieyouxu (no rush)

(No LLM was or will be used by me during the entire creation process of this PR)

@rustbot

rustbot commented Nov 5, 2026

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2026
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Nov 5, 2026
pub(crate) const RUSTC_DEFAULT: Self = Self::Year(2015);
pub(crate) const LATEST_STABLE: Self = Self::Year(2024);

pub(crate) fn to_flag(self) -> String {

@fmease fmease Nov 5, 2026 •

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Apologies in advance for potential abstraction layer violations.

View changes since the review

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It's fine, it's a bit of a mess already. I need to clean this up...

@jieyouxu jieyouxu left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks. I think there's more fundamental problems in the handling here re. #165479 (comment), but this is at least sensible and a small improvement IMO...

@bors r+ rollup

View changes since this review

Comment on lines +36 to +37
// FIXME: Why do we need to ignore the edition?
let TestProps { edition: _, compile_flags, run_flags, .. } = props;

@jieyouxu jieyouxu Nov 5, 2026 •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

(rustdoc_gui_test is a bit of an hack, and honestly I'm not sure... IIRC rustdoc_gui_test didn't want to mirror/reimpl test directive handling which is why there's a bit of an hack.)

@rust-bors

rust-bors Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3a5b17c has been approved by jieyouxu

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Nov 5, 2026
…ition, r=jieyouxu

compiletest: Fix the edition of minicore to the latest stable one

...instead of using whatever edition the dependent / the reverse dependency is using (!).

Context: rust-lang#165479 (comment).

Unblocks PR rust-lang#165487.

r? @jieyouxu (no rush)

<sub>(No LLM was or will be used by me during the entire creation process of this PR)</sub>
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Nov 5, 2026
…ition, r=jieyouxu

compiletest: Fix the edition of minicore to the latest stable one

...instead of using whatever edition the dependent / the reverse dependency is using (!).

Context: rust-lang#165479 (comment).

Unblocks PR rust-lang#165487.

r? @jieyouxu (no rush)

<sub>(No LLM was or will be used by me during the entire creation process of this PR)</sub>
rust-bors Bot pushed a commit that referenced this pull request Nov 5, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #165496 (c-variadic: remove stale `cfg(bootstrap)` comment)
 - #164716 (Lower UEFI targets through LLVM's *uefi triple)
 - #165497 (fix unsoundness when compiling `[diverging_const; _]`)
 - #165275 (Build TPDE with local Clang when available)
 - #165467 (Use `emit_ptr_va_arg` for `va_arg` on MSP430)
 - #165483 (compiletest: Fix the edition of minicore to the latest stable one)
 - #165498 (LoongArch: Fix direct-access-external-data test)
 - #165501 (rustdoc: Don't add a border on an empty `:target` element)
@rust-bors
rust-bors Bot merged commit cc5cc58 into rust-lang:main Nov 5, 2026
14 checks passed
@rustbot rustbot added this to the 1.101.0 milestone Nov 5, 2026
rust-bors Bot pushed a commit that referenced this pull request Nov 5, 2026
Rollup merge of #165483 - fmease:comptest-fixate-minicore-edition, r=jieyouxu

compiletest: Fix the edition of minicore to the latest stable one

...instead of using whatever edition the dependent / the reverse dependency is using (!).

Context: #165479 (comment).

Unblocks PR #165487.

r? @jieyouxu (no rush)

<sub>(No LLM was or will be used by me during the entire creation process of this PR)</sub>
@fmease
fmease deleted the comptest-fixate-minicore-edition branch November 5, 2026 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-compiletest Area: The compiletest test runner A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-minicore` A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants