Skip to content

Rollup of 12 pull requests - #164885

Closed
jieyouxu wants to merge 131 commits into
rust-lang:mainfrom
jieyouxu:rollup-ezIOnLM
Closed

jieyouxu wants to merge 131 commits into
rust-lang:mainfrom
jieyouxu:rollup-ezIOnLM

Conversation

@jieyouxu

@jieyouxu jieyouxu commented Oct 25, 2026 •

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

xtqqczze and others added 30 commits May 29, 2026 21:21
GenMC now supports weak CASes and the failure ordering of CASes.
Hence, the CAS API is adjusted accordingly (no change in behavior
for now).
Modeling spurious failures is opt-in (see
`-Zmiri-genmc-weak-cas-spurious-failures`), since Miri-GenMC cannot
bound all retry loops involving weak CASes (e.g., the ones in the
standard library).
…al-context-ref-readonly

Use  `eval_context_ref` where mutable access is not needed
support  __cxa_thread_atexit_impl and correctly handle thread cleanup on exit
GenMC: Support for weak CASes and CAS failure ordering
This updates the rust-version file to 8144389.
…cos-check-shim-sig

macOS shims: migrate to check_shim_sig
…round

Remove /tmp workaround now that rustdoc fixed the disk usage issue
@rustbot rustbot added 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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. labels Oct 25, 2026
@jieyouxu

Copy link
Copy Markdown
Member Author

Letting #162808 go in its own PR, that might fail in some weird places.

@jieyouxu

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

📌 Commit c3428cd 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 Oct 25, 2026
@jieyouxu

Copy link
Copy Markdown
Member Author

@bors try jobs=test-aarch64-apple-1,test-x86_64-msvc-1,test-various,dist-aarch64-msvc

@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 25, 2026
Rollup of 12 pull requests


try-job: test-aarch64-apple-1
try-job: test-x86_64-msvc-1
try-job: test-various
try-job: dist-aarch64-msvc
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 25, 2026
Rollup of 12 pull requests

Successful merges:

 - #164834 (miri subtree update)
 - #164869 (rustc_codegen_gcc subtree update)
 - #157123 (library: optimize truncate method)
 - #159916 (Optimize `str.escape_default().to_string()`)
 - #164508 (ping me for layout invariant changes)
 - #164758 (Update dependency jinja2 to v3.1.6 [SECURITY])
 - #164802 (Migrate stable-specific run-make tests to UI tests)
 - #164836 (Add regression test for #162109)
 - #164857 (Do not checkout Cargo for bootstrap tests)
 - #164868 (Fix skipping library build with `--keep-stage[-std]`)
 - #164872 (cg_llvm: clarify Send / Sync story for modules)
 - #164881 (Add FIXME comments to `from_ascii_bytes_radix_impl`)
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-x86_64-gnu-stable failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
---- [ui] tests/ui/traits/const-traits/const-supertrait-unstable.rs#stable-enabled stdout ----
Saved the actual stderr to `/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/traits/const-traits/const-supertrait-unstable.stable-enabled/const-supertrait-unstable.stable-enabled.stderr`
diff of stderr:

10 LL | trait Bar: [const] Foo {}
11    | ^^^^^^^^^^^^^^^^^^^^^^^^^
12 
- error[E0554]: `#![feature]` may not be used on the nightly release channel
+ error[E0554]: `#![feature]` may not be used on the stable release channel
14   --> $DIR/const-supertrait-unstable.rs:18:30
---
To only update this specific test, also pass `--test-args traits/const-traits/const-supertrait-unstable.rs`

error in revision `stable-enabled`: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_BOOTSTRAP="-allow-unstable-compiler-flags=simulate-remapped-rust-src-base,translate-remapped-path-to-local-path,ignore-directory-in-diagnostics-source-blocks,deduplicate-diagnostics,write-long-types-to-disk,codegen-backend,next-solver,polonius,wasm-proc-macros,threads,ui-testing,unstable-options" RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--cfg" "stable_enabled" "--check-cfg" "cfg(test,FALSE,stable,stable_enabled,nightly,nightly_enabled)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/traits/const-traits/const-supertrait-unstable.stable-enabled" "-Znext-solver=coherence" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2015" "--check-cfg=cfg(feature_enabled)" "--cfg" "feature_enabled"
stdout: none
--- stderr -------------------------------
error: `[const]` is not allowed here
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:12
   |
LL | trait Bar: [const] Foo {}
   |            ^^^^^^^
   |
note: this trait is not `const`, so it cannot have `[const]` trait bounds
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:1
   |
LL | trait Bar: [const] Foo {}
   | ^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0554]: `#![feature]` may not be used on the stable release channel
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:18:30
   |
LL | #![cfg_attr(feature_enabled, feature(const_trait_impl))]
   |                              ^^^^^^^^^^^^^^^^^^^^^^^^^

error: `[const]` can only be applied to `const` traits
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:12
   |
LL | trait Bar: [const] Foo {}
   |            ^^^^^^^ can't be applied to `Foo`
   |
note: `Foo` can't be used with `[const]` because it isn't `const`
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:21:1
   |
LL | trait Foo {
   | ^^^^^^^^^

error: `[const]` can only be applied to `const` traits
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:12
   |
LL | trait Bar: [const] Foo {}
   |            ^^^^^^^ can't be applied to `Foo`
   |
note: `Foo` can't be used with `[const]` because it isn't `const`
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:21:1
   |
LL | trait Foo {
   | ^^^^^^^^^
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: `[const]` can only be applied to `const` traits
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:12
   |
LL | trait Bar: [const] Foo {}
   |            ^^^^^^^ can't be applied to `Foo`
   |
note: `Foo` can't be used with `[const]` because it isn't `const`
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:21:1
   |
LL | trait Foo {
   | ^^^^^^^^^
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: `[const]` can only be applied to `const` traits
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:32:17
   |
LL | const fn foo<T: [const] Bar>(x: &T) {
   |                 ^^^^^^^ can't be applied to `Bar`
   |
note: `Bar` can't be used with `[const]` because it isn't `const`
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:1
   |
LL | trait Bar: [const] Foo {}
   | ^^^^^^^^^^^^^^^^^^^^^^

error: `[const]` can only be applied to `const` traits
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:32:17
   |
LL | const fn foo<T: [const] Bar>(x: &T) {
   |                 ^^^^^^^ can't be applied to `Bar`
   |
note: `Bar` can't be used with `[const]` because it isn't `const`
  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:25:1
   |
LL | trait Bar: [const] Foo {}
   | ^^^^^^^^^^^^^^^^^^^^^^
   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error[E0015]: cannot call non-const method `<T as Foo>::a` in constant functions
##[error]  --> /checkout/tests/ui/traits/const-traits/const-supertrait-unstable.rs:36:7
   |
LL |     x.a();
   |       ^^^
   |

@rust-bors rust-bors Bot 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 Oct 25, 2026
@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 8603eed failed: CI. Failed job:

@jieyouxu

Copy link
Copy Markdown
Member Author

@bors r-

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2026
@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

PR #164802, which is a member of this rollup, was unapproved.

@jieyouxu jieyouxu closed this Oct 25, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 25, 2026
@jieyouxu
jieyouxu deleted the rollup-ezIOnLM branch October 25, 2026 05:17
@rust-bors

rust-bors Bot commented Oct 25, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: b5f12f1 (b5f12f161d636666c9e03899141d48c04545ba14)
Base parent: dc44e7f (dc44e7f2c436b6041742e138b9c2176f093196d5)

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

Labels

A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.