-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Make std/src/num
mirror core/src/num
#137574
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Conversation
rustbot has assigned @workingjubilee. Use |
☔ The latest upstream changes (presumably #138768) made this pull request unmergeable. Please resolve the merge conflicts. |
??? why didn't I see this in my queue on previous checks? |
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. |
7fa7a70
to
e00fa2f
Compare
Wondered about this too, I think it is because @rustbot ready |
☔ The latest upstream changes (presumably #139734) made this pull request unmergeable. Please resolve the merge conflicts. |
oh okay. |
r=me with rebase assuming nothing changes wildly |
@rustbot author |
Reminder, once the PR becomes ready for a review, use |
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.
e00fa2f
to
a5f3b1e
Compare
Clearly seems I was in no hurry 😆 it rebased cleanly though. @bors r=workingjubilee rollup |
A job failed! Check out the build log: (web) (plain) Click to see the possible cause of the failure (guessed by this bot)
|
(tidy error looks like the ongoing Ubuntu server issues) |
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
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
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.
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.
…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
The float modules in
std
are currently top-level but forcore
, they are nested within thenum
directory and referenced by#[path = ...]
. For consistency, adjuststd
to use the same structure ascore
.Also change the
f16
andf128
gates from outer attributes to inner attributes likecore
has.