Skip to content

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Oct 20, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

connortsui20 and others added 9 commits October 17, 2025 10:57
It is a bit confusing when reading code that uses this type since it is
not immediately obvious that it is specific to `Once`.

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
Moves things around to make a bit more sense (plus prepare moving `once`
out of `poison`.

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
Since `Once` will not have a non-poisoning variant, we remove it from
the `poison` module.

Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
…=tgross35

move `once` module out of `poison`

From rust-lang#134645 (comment), since `Once` will not have a non-poisoning variant, we remove it from the `poison` module.

Additionally:

1. Renames `once::ExclusiveState` to `OnceExclusiveState` since it was a bit confusing reading just `ExclusiveState` where it is used.
2. Reorders a few module definitions and re-exports in `library/std/src/sync/mod.rs` for clarity.

Also, once this is merged, I think that we can begin the process of stabilizing [`sync_poison_mod`](rust-lang#134646)
…ident-rules, r=notriddle,GuillaumeGomez

rustdoc search: relax rules for identifiers

fixes rust-lang#147763
… r=ChrisDenton

handle spurious returns of `wait_timeout` in test

Fixes rust-lang#147885
Closes rust-lang#147871

`wait_timeout` is allowed to spuriously return, hence the `timeout_nanoseconds` must not assume that the wakeup resulted from a `notify_all()`.
@rustbot rustbot added A-rustdoc-search Area: Rustdoc's search feature S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. rollup A PR which is a rollup labels Oct 20, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Oct 20, 2025

📌 Commit 6da66bd has been approved by matthiaskrgr

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 Oct 20, 2025
bors added a commit that referenced this pull request Oct 20, 2025
Rollup of 3 pull requests

Successful merges:

 - #147125 (move `once` module out of `poison`)
 - #147860 (rustdoc search: relax rules for identifiers)
 - #147910 (handle spurious returns of `wait_timeout` in test)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Oct 20, 2025

⌛ Testing commit 6da66bd with merge 4d014a5...

@rust-log-analyzer
Copy link
Collaborator

The job i686-gnu-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] supports_hyperlinks test:false 0.627
[RUSTC-TIMING] toml_edit test:false 22.867
[RUSTC-TIMING] glob test:false 5.178
[RUSTC-TIMING] gix test:false 79.329
rustc: /checkout/src/llvm-project/llvm/include/llvm/ADT/DenseMap.h:696: bool llvm::DenseMapBase<DerivedT, KeyT, ValueT, KeyInfoT, BucketT>::LookupBucketFor(const LookupKeyT&, BucketT*&) [with LookupKeyT = unsigned int; DerivedT = llvm::SmallDenseMap<unsigned int, unsigned int, 8, llvm::DenseMapInfo<unsigned int>, llvm::detail::DenseMapPair<unsigned int, unsigned int> >; KeyT = unsigned int; ValueT = unsigned int; KeyInfoT = llvm::DenseMapInfo<unsigned int>; BucketT = llvm::detail::DenseMapPair<unsigned int, unsigned int>]: Assertion `!KeyInfoT::isEqual(Val, EmptyKey) && !KeyInfoT::isEqual(Val, TombstoneKey) && "Empty/Tombstone value shouldn't be inserted into map!"' failed.
[RUSTC-TIMING] cargo test:false 314.284
rustc exited with signal: 6 (SIGABRT) (core dumped)
error: could not compile `cargo` (lib)

Caused by:
  process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc /checkout/obj/build/bootstrap/debug/rustc --crate-name cargo --edition=2024 src/tools/cargo/src/cargo/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C opt-level=3 -C embed-bitcode=no '--allow=clippy::all' '--warn=clippy::correctness' '--warn=clippy::self_named_module_files' --warn=rust_2018_idioms '--allow=rustdoc::private_intra_doc_links' '--warn=clippy::print_stdout' '--warn=clippy::print_stderr' '--warn=clippy::disallowed_methods' '--warn=clippy::dbg_macro' -C debug-assertions=on --cfg 'feature="all-static"' --cfg 'feature="default"' --cfg 'feature="http-transport-curl"' --cfg 'feature="openssl"' --cfg 'feature="vendored-libgit2"' --cfg 'feature="vendored-openssl"' --check-cfg 'cfg(docsrs,test)' --check-cfg 'cfg(feature, values("all-static", "default", "http-transport-curl", "http-transport-reqwest", "openssl", "vendored-libgit2", "vendored-openssl"))' -C metadata=9a4bc4075ab15b36 -C extra-filename=-ff8cd166bbb8eaef --out-dir /checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps --target i686-unknown-linux-gnu -L dependency=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/release/deps --extern annotate_snippets=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libannotate_snippets-4f6837873b3715a4.rmeta --extern anstream=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libanstream-c0a2870244f25eb2.rmeta --extern anstyle=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libanstyle-17d220067fe00b39.rmeta --extern anyhow=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libanyhow-ec496e34387f0f0e.rmeta --extern base64=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libbase64-815e3c0623b471d7.rmeta --extern blake3=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libblake3-95a6dadc7ae97696.rmeta --extern cargo_credential=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcargo_credential-d6822fbf3717e42a.rmeta --extern cargo_credential_libsecret=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcargo_credential_libsecret-844963e09f45b772.rmeta --extern cargo_platform=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcargo_platform-fea6fc2321db4bea.rmeta --extern cargo_util=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcargo_util-fd41aba4497668fa.rmeta --extern cargo_util_schemas=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcargo_util_schemas-82c6495b3650fac7.rmeta --extern clap=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libclap-4b9ecfbae7d3ad37.rmeta --extern clap_complete=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libclap_complete-d2862e63dc829184.rmeta --extern color_print=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcolor_print-725bcff74066d767.rmeta --extern crates_io=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcrates_io-0c512a70910a6891.rmeta --extern curl=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcurl-f8a3c6b7f6fac01d.rmeta --extern curl_sys=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libcurl_sys-b3572dda08a29d41.rmeta --extern filetime=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libfiletime-a65a70bb46e75aef.rmeta --extern flate2=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libflate2-73b27c7eb03cd595.rmeta --extern git2=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libgit2-f17ac350c57cf72e.rmeta --extern git2_curl=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libgit2_curl-27f61a539b046308.rmeta --extern gix=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libgix-4568e19f1d17a5ee.rmeta --extern glob=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libglob-f4d5f3c5cfdd8c73.rmeta --extern hex=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libhex-4175068e5c4f108b.rmeta --extern hmac=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libhmac-ca8cbaafe018b6bf.rmeta --extern home=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libhome-2f47675be40cac3c.rmeta --extern http_auth=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libhttp_auth-4ce833f60bd1c1a1.rmeta --extern ignore=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libignore-25e6476b18eded0d.rmeta --extern im_rc=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libim_rc-d824adc1c0543c78.rmeta --extern indexmap=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libindexmap-d28562f5657c771f.rmeta --extern itertools=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libitertools-5e60dbe9933d5707.rmeta --extern jiff=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libjiff-eb806c305c05ed29.rmeta --extern jobserver=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libjobserver-08a9d2e130d41a18.rmeta --extern lazycell=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/liblazycell-6c1608b6691099f6.rmeta --extern libc=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/liblibc-c089059ad8735d0d.rmeta --extern libgit2_sys=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/liblibgit2_sys-bd1f7fa617957b02.rmeta --extern memchr=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libmemchr-02bb120c4267d4f0.rmeta --extern opener=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libopener-6f508e051547d1b6.rmeta --extern openssl=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libopenssl-365e8f57f3fc645e.rmeta --extern os_info=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libos_info-afb54ff352c7ea0d.rmeta --extern pasetors=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libpasetors-258ab537862b0088.rmeta --extern pathdiff=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libpathdiff-096b10c7ea3fd7a8.rmeta --extern rand=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/librand-d2d15db399641623.rmeta --extern regex=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libregex-e68c38bf737f5455.rmeta --extern rusqlite=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/librusqlite-aaf20bab4fecadf3.rmeta --extern rustc_hash=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/librustc_hash-978b6a845e948861.rmeta --extern rustc_stable_hash=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/librustc_stable_hash-8992c8d308d8d0c6.rmeta --extern rustfix=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/librustfix-6ef5e8d43725def4.rmeta --extern same_file=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libsame_file-e80b100f32fb0a0a.rmeta --extern semver=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libsemver-12ab61300f01c839.rmeta --extern serde=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libserde-8d7f3a2c81233703.rmeta --extern serde_untagged=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libserde_untagged-a691bf65ec1523e6.rmeta --extern serde_ignored=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libserde_ignored-700bbe0f9eb6cc62.rmeta --extern serde_json=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libserde_json-dd32e42bf7812d56.rmeta --extern sha1=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libsha1-2506522627c6b420.rmeta --extern shell_escape=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libshell_escape-3ddd0e71112a64bd.rmeta --extern supports_hyperlinks=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libsupports_hyperlinks-0ad30afa297c7b7b.rmeta --extern supports_unicode=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libsupports_unicode-adb01d69ed635719.rmeta --extern tar=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtar-4ab90e36857e5e9e.rmeta --extern tempfile=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtempfile-ac7553e255fb5ce7.rmeta --extern thiserror=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libthiserror-ee799a67d236f09d.rmeta --extern time=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtime-ddb61fa7903cb632.rmeta --extern toml=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtoml-486e3f5bbf942384.rmeta --extern toml_edit=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtoml_edit-d02eae4c2ac46d00.rmeta --extern tracing=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtracing-53945f697e6777e1.rmeta --extern tracing_chrome=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtracing_chrome-28c8e5eaf233f111.rmeta --extern tracing_subscriber=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libtracing_subscriber-d456488e2d9d1526.rmeta --extern unicase=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libunicase-5309ebe4ff885c7e.rmeta --extern unicode_width=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libunicode_width-ef78d1f7190266bf.rmeta --extern unicode_xid=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libunicode_xid-cbb2829d1d897c4d.rmeta --extern url=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/liburl-b200f0747b7ebad8.rmeta --extern walkdir=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libwalkdir-9560a51c63c04168.rmeta --extern winnow=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/deps/libwinnow-b93fed60fa2f5c2f.rmeta --cfg=windows_raw_dylib -Csymbol-mangling-version=v0 -Zunstable-options -Zmacro-backtrace -Csplit-debuginfo=off -Clink-args=-Wl,-z,origin '-Clink-args=-Wl,-rpath,$ORIGIN/../lib' -Alinker-messages -Zunstable-options -Z binary-dep-depinfo -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/blake3-7739b2160022cf68/out -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/curl-sys-0f3edb266d773c33/out/build -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libnghttp2-sys-f7e03f34a917e467/out/i/lib -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libz-sys-49e10beff8cd44cc/out/lib -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libz-sys-49e10beff8cd44cc/out/lib -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/openssl-sys-689d01f776d72f0b/out/openssl-build/install/lib -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libgit2-sys-3c6381e82f3d9cad/out/build -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libssh2-sys-a29107a5c4644337/out/build -L native=/checkout/obj/build/i686-unknown-linux-gnu/stage2-tools/i686-unknown-linux-gnu/release/build/libsqlite3-sys-176bef62e86b5215/out` (exit status: 254)
Bootstrap failed while executing `--stage 2 test --skip compiler --skip src`
Build completed unsuccessfully in 1:59:06
  local time: Mon Oct 20 22:02:43 UTC 2025
  network time: Mon, 20 Oct 2025 22:02:43 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Collaborator

bors commented Oct 20, 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 Oct 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustdoc-search Area: Rustdoc's search feature rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, 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. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants