Skip to content

Conversation

@BoxyUwU
Copy link
Member

@BoxyUwU BoxyUwU commented Dec 10, 2025

r? release

@rustbot
Copy link
Collaborator

rustbot commented Dec 10, 2025

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 10, 2025
@BoxyUwU
Copy link
Member Author

BoxyUwU commented Dec 10, 2025

r? mark-simulacrum

@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 10, 2025

📌 Commit 8995537 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors 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 Dec 10, 2025
@matthiaskrgr
Copy link
Member

@bors rollup=never

@jieyouxu
Copy link
Member

@bors p=5 (just to get the bootstrap compiler bump done)

@bors
Copy link
Collaborator

bors commented Dec 11, 2025

⌛ Testing commit 8995537 with merge 7eae21d...

bors added a commit that referenced this pull request Dec 11, 2025
bump bootstrap compiler to 1.93 beta

r? release
@bors
Copy link
Collaborator

bors commented Dec 11, 2025

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 11, 2025
@Zalathar
Copy link
Member

@bors retry (timeout)

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 11, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 18, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@cuviper
Copy link
Member

cuviper commented Dec 18, 2025

@bors try jobs=i686-pc-windows-msvc

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Dec 18, 2025
bump bootstrap compiler to 1.93 beta

try-job: i686-pc-windows-msvc
@rust-bors

This comment was marked as outdated.

@rust-log-analyzer

This comment was marked as outdated.

@cuviper
Copy link
Member

cuviper commented Dec 18, 2025

@bors try jobs=i686-msvc-2

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Dec 18, 2025
bump bootstrap compiler to 1.93 beta

try-job: i686-msvc-2
@rust-bors
Copy link

rust-bors bot commented Dec 18, 2025

☀️ Try build successful (CI)
Build commit: 776cfb6 (776cfb6c723e584291c9845bcac062f8f865efeb, parent: fcf67da039f42e3905cf6f69e33304299c45149f)

@cuviper
Copy link
Member

cuviper commented Dec 19, 2025

@bors r=Mark-Simulacrum,cuviper

@bors
Copy link
Collaborator

bors commented Dec 19, 2025

📌 Commit 575a02e has been approved by Mark-Simulacrum,cuviper

It is now in the queue for this repository.

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 19, 2025
@bors
Copy link
Collaborator

bors commented Dec 19, 2025

⌛ Testing commit 575a02e with merge 6b02110...

bors added a commit that referenced this pull request Dec 19, 2025
bump bootstrap compiler to 1.93 beta

r? release
@rust-log-analyzer
Copy link
Collaborator

The job pr-check-2 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
Didn't find `Class::Original` to close
stack backtrace:
   0: __rustc::rust_begin_unwind
   1: core::panicking::panic_fmt
   2: rustdoc::html::highlight::end_expansion::<core::fmt::Formatter>
   3: rustdoc::html::highlight::write_code::<core::fmt::Formatter>::{closure#2}
   4: <rustdoc::html::highlight::Classifier>::advance
   5: rustdoc::html::highlight::classify
   6: rustdoc::html::highlight::write_code::<core::fmt::Formatter>
   7: <&core::fmt::builders::FromFn<rustdoc::html::sources::print_src<&mut core::fmt::Formatter>::{closure#0}> as core::fmt::Display>::fmt
   8: core::fmt::write
   9: <&askama::filters::escape::Safe<&core::fmt::builders::FromFn<rustdoc::html::sources::print_src<&mut core::fmt::Formatter>::{closure#0}>> as core::fmt::Display>::fmt
  10: core::fmt::write
  11: <rustdoc::html::sources::SourceCollector as rustdoc::visit::DocVisitor>::visit_item
  12: <rustdoc::html::sources::SourceCollector as rustdoc::visit::DocVisitor>::visit_item
  13: <rustdoc::html::sources::SourceCollector as rustdoc::visit::DocVisitor>::visit_item
  14: <rustdoc::html::render::context::Context>::init
---
warning: the ICE couldn't be written to `/checkout/rustc-ice-2025-12-19T04_36_53-185118.txt`: Read-only file system (os error 30)

note: rustc 1.93.0-beta.1 (1b6e21e16 2025-12-08) running on x86_64-unknown-linux-gnu

note: compiler flags: --crate-type lib -Z unstable-options -C symbol-mangling-version=v0 -Z unstable-options -Z normalize-docs -Z crate-attr=warn(rust_2018_idioms) -Z force-unstable-if-unmarked -Z crate-attr=doc(rust_logo) -Z crate-attr=doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/") -Z crate-attr=feature(rustdoc_internals)

note: some of the compiler flags provided by cargo are hidden

query stack during panic:
end of query stack
error: could not document `rustc_mir_build`
warning: build failed, waiting for other jobs to finish...
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo doc --target x86_64-unknown-linux-gnu -Zbinary-dep-depinfo -j 4 -Zroot-dir=/checkout --locked --color=always --release --features llvm --manifest-path /checkout/compiler/rustc/Cargo.toml -Zskip-rustdoc-fingerprint --no-deps -Zrustdoc-map -p rustc-main -p rustc_abi -p rustc_arena -p rustc_ast -p rustc_ast_ir -p rustc_ast_lowering -p rustc_ast_passes -p rustc_ast_pretty -p rustc_attr_parsing -p rustc_baked_icu_data -p rustc_borrowck -p rustc_builtin_macros -p rustc_codegen_llvm -p rustc_codegen_ssa -p rustc_const_eval -p rustc_data_structures -p rustc_driver -p rustc_driver_impl -p rustc_error_codes -p rustc_error_messages -p rustc_errors -p rustc_expand -p rustc_feature -p rustc_fluent_macro -p rustc_fs_util -p rustc_graphviz -p rustc_hashes -p rustc_hir -p rustc_hir_analysis -p rustc_hir_id -p rustc_hir_pretty -p rustc_hir_typeck -p rustc_incremental -p rustc_index -p rustc_index_macros -p rustc_infer -p rustc_interface -p rustc_lexer -p rustc_lint -p rustc_lint_defs -p rustc_llvm -p rustc_log -p rustc_macros -p rustc_metadata -p rustc_middle -p rustc_mir_build -p rustc_mir_dataflow -p rustc_mir_transform -p rustc_monomorphize -p rustc_next_trait_solver -p rustc_parse -p rustc_parse_format -p rustc_passes -p rustc_pattern_analysis -p rustc_privacy -p rustc_proc_macro -p rustc_public -p rustc_public_bridge -p rustc_query_impl -p rustc_query_system -p rustc_resolve -p rustc_sanitizers -p rustc_serialize -p rustc_session -p rustc_span -p rustc_symbol_mangling -p rustc_target -p rustc_thread_pool -p rustc_trait_selection -p rustc_traits -p rustc_transmute -p rustc_ty_utils -p rustc_type_ir -p rustc_type_ir_macros -p rustc_windows_rc [workdir=/checkout]` failed with exit code 101
Created at: src/bootstrap/src/core/build_steps/doc.rs:916:25
Executed at: src/bootstrap/src/core/build_steps/doc.rs:977:26

Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `doc compiler --stage 1`
Build completed unsuccessfully in 0:01:45
  local time: Fri Dec 19 04:37:00 UTC 2025
  network time: Fri, 19 Dec 2025 04:37:00 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Collaborator

bors commented Dec 19, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 19, 2025
@jieyouxu
Copy link
Member

Huh, that looks like #148617 and #148655 🤔

@jieyouxu
Copy link
Member

jieyouxu commented Dec 19, 2025

EDIT: also, I think there's like 4 cfg(bootstrap)/cfg(not(bootstrap)) in rustc_fluent_macros too, I'm seeing warnings for them locally?

@jieyouxu
Copy link
Member

jieyouxu commented Dec 19, 2025

Ah. So, beta rustdoc currently is ICEing on in-tree rustc_mir_build likely due to #148617-adjacent reasons. It's possible to temporarily unblock this bootstrap bump by intentionally regressing the macro-expansion buttons in compiler docs via --generate-macro-expansion in doc::Rustc's

cargo.rustdocflag("--generate-macro-expansion");

$ git diff src/bootstrap/src/core/build_steps/doc.rs
diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index fa36a6471ca..bf3de56cd02 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -932,7 +932,7 @@ fn run(self, builder: &Builder<'_>) {
         // see https://github.com/rust-lang/rust/pull/122066#issuecomment-1983049222
         // If there is any bug, please comment out the next line.
         cargo.rustdocflag("--generate-link-to-definition");
-        cargo.rustdocflag("--generate-macro-expansion");
+        //cargo.rustdocflag("--generate-macro-expansion");

         compile::rustc_cargo(builder, &mut cargo, target, &build_compiler, &self.crates);
         cargo.arg("-Zskip-rustdoc-fingerprint");

This locally makes ./x doc compiler/ --stage=1 pass for me. (Note that ./x doc compiler/ --stage=2 passes for me with an in-tree rustdoc, so it seems like only beta rustdoc is ICEing somehow.)

What I don't understand is why. Maybe #148655 wasn't sufficient, somehow? cc @GuillaumeGomez maybe you have any ideas?

EDIT: oh, this is very new:

So yeah, we can temporarily revert enabling --generate-macro-expansion to unblock bootstrap bump.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.