Make std/src/num mirror core/src/num#137574
Merged
bors merged 1 commit intorust-lang:masterfrom May 30, 2025
Merged
Conversation
Collaborator
|
rustbot has assigned @workingjubilee. Use |
rustbot
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #138768) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
??? why didn't I see this in my queue on previous checks? |
Member
|
oh wait, I see, I remember... ...uh, can we just I think I withheld comment because I was going to take a closer look to validate whether that was doable before I left the review comment, but that was an inappropriate delay and I should have left the comment, then doublechecked if I had spare energy. Sorry. |
workingjubilee
added
S-waiting-on-author
tgross35
force-pushed
the
std-float-reorganization
branch
from
7fa7a70 to
e00fa2f
Compare
Contributor
Author
Wondered about this too, I think it is because @rustbot ready |
rustbot
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #139734) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
oh okay. |
Member
|
r=me with rebase assuming nothing changes wildly |
Member
|
@rustbot author |
rustbot
removed
the
S-waiting-on-review
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
rustbot
added
the
S-waiting-on-author
The float modules in `std` are currently top-level but for `core`, they are nested within the `num` directory and referenced by `#[path = ...]`. For consistency, adjust `std` to use the same structure as `core`. Also change the `f16` and `f128` gates from outer attributes to inner attributes like `core` has.
tgross35
force-pushed
the
std-float-reorganization
branch
from
e00fa2f to
a5f3b1e
Compare
Contributor
Author
Clearly seems I was in no hurry 😆 it rebased cleanly though. @bors r=workingjubilee rollup |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
|
A job failed! Check out the build log: (web) (plain) Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
(tidy error looks like the ongoing Ubuntu server issues) |
bors
added a commit
that referenced
this pull request
May 29, 2025
Rollup of 11 pull requests Successful merges: - #137574 (Make `std/src/num` mirror `core/src/num`) - #141384 (Enable review queue tracking) - #141448 (A variety of improvements to the codegen backends) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) - #141676 (float: Disable `total_cmp` sNaN tests for `f16`) - #141705 (Add eslint as part of `tidy` run) - #141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - #141723 (Provide secrets to try builds with new bors) - #141728 (Fix false documentation of FnCtxt::diverges) - #141729 (resolve target-libdir directly from rustc) - #141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
that referenced
this pull request
May 29, 2025
Rollup of 11 pull requests Successful merges: - #137574 (Make `std/src/num` mirror `core/src/num`) - #141384 (Enable review queue tracking) - #141448 (A variety of improvements to the codegen backends) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) - #141676 (float: Disable `total_cmp` sNaN tests for `f16`) - #141705 (Add eslint as part of `tidy` run) - #141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - #141723 (Provide secrets to try builds with new bors) - #141728 (Fix false documentation of FnCtxt::diverges) - #141729 (resolve target-libdir directly from rustc) - #141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
May 30, 2025
Rollup merge of #137574 - tgross35:std-float-reorganization, r=workingjubilee Make `std/src/num` mirror `core/src/num` The float modules in `std` are currently top-level but for `core`, they are nested within the `num` directory and referenced by `#[path = ...]`. For consistency, adjust `std` to use the same structure as `core`. Also change the `f16` and `f128` gates from outer attributes to inner attributes like `core` has.
github-merge-queue bot
pushed a commit
to model-checking/kani
that referenced
this pull request
Jun 3, 2025
Relevant upstream PRs: - rust-lang/rust#141507 (identified by @tautschnig): replaces the atomic_load intrinstics (`atomic_load_seqcst`, `atomic_load_acquire`, and `atomic_load_relaxed`) by a new `atomic_load` intrinsic that is generic in the atomic ordering. Update the Kani code and tests accordingly. - rust-lang/rust#137574: Moved the `num` module from `std/src/num.rs` to `std/src/num/mod.rs` which required updating the corresponding path in the `script-based-pre/verify_std_cmd` test. Resolves #4120 ### Call-outs: - Instead of replacing the `String` parameter of Kani's `AtomicLoad` enum variant by `AtomicOrdering`, I opted to remove the parameter altogether since Kani doesn't do anything with it at the moment. We can easily add a parameter to that enum variant in the future if Kani needs it. - The upstream change to `atomic_load` is expected to be followed by similar changes to all atomic intrinsics. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
github-actions bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
Jun 3, 2025
…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#137574 (Make `std/src/num` mirror `core/src/num`) - rust-lang#141384 (Enable review queue tracking) - rust-lang#141448 (A variety of improvements to the codegen backends) - rust-lang#141636 (avoid some usages of `&mut P<T>` in AST visitors) - rust-lang#141676 (float: Disable `total_cmp` sNaN tests for `f16`) - rust-lang#141705 (Add eslint as part of `tidy` run) - rust-lang#141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - rust-lang#141723 (Provide secrets to try builds with new bors) - rust-lang#141728 (Fix false documentation of FnCtxt::diverges) - rust-lang#141729 (resolve target-libdir directly from rustc) - rust-lang#141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The float modules in
stdare currently top-level but forcore, they are nested within thenumdirectory and referenced by#[path = ...]. For consistency, adjuststdto use the same structure ascore.Also change the
f16andf128gates from outer attributes to inner attributes likecorehas.