Skip to content

Rollup of 8 pull requests - #134812

Merged
bors merged 18 commits into
rust-lang:masterfrom
jhpratt:rollup-a9klvez
Dec 27, 2024
Merged

Rollup of 8 pull requests#134812
bors merged 18 commits into
rust-lang:masterfrom
jhpratt:rollup-a9klvez

Conversation

@jhpratt

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

c410-f3rand others added 18 commits December 1, 2024 19:10
…te keys.
This behavior is worth documenting because there are other plausible
alternatives, such as panicking when a duplicate is encountered, and
it reminds the programmer to consider whether they should, for example,
coalesce duplicate keys first.
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
This removes boilerplate around `Arc`s and makes the code more clear.
With rust-lang#80608 the `unwinding` crate no longer builds. The upstream crate
has been updated to build by manually adding directives to the naked_asm
stream.
Bump the dependency in Rust to get this newer version. This fixes the
build for Xous, and closesrust-lang#134403.
Signed-off-by: Sean Cross <sean@xobs.io>
Rustdoc has no way to show that an item is stable,
but only at a different path. `std::ffi::c_str::NulError` is
not stable, but `std::ffi::NulError` is.
To avoid marking these types as unstable when someone just
wants to follow a link from `CString`, inline them into their
stable paths.
…kang
[macro_metavar_expr_concat] Fixrust-lang#128346Fixrust-lang#128346Fixrust-lang#131393
The syntax is invalid in both issues so I guess that theoretically the compiler should have aborted early.
This PR tries to fix a local problem but let me know if there are better options.
cc `@petrochenkov` if you are interested
Add `into_array` conversion destructors for `Box`, `Rc`, and `Arc`.
Tracking issue: rust-lang#133508
This PR adds the `into_array` destructor for `alloc::boxed::Box<[T]>`, `alloc::rc::Rc<[T]>`, and `alloc::sync::Arc<[T]>`.
Note that this PR assumes the initial proposal of these functions returning `Option`. It is still an open question whether this should instead be `Result`. We can, however, easily change this in a follow-up PR with the necessary consensus.
Document collection `From` and `FromIterator` impls that drop duplicate keys.
This behavior is worth documenting because there are other plausible alternatives, such as panicking when a duplicate is encountered, and it reminds the programmer to consider whether they should, for example, coalesce duplicate keys first.
Followup to rust-lang#89869.
Fix forgetting to save statx availability on success
Looks like we forgot to save the statx state on success which means the first failure (common when checking if a file exists) will always require spending an invalid statx to confirm the failure is real.
r? `@thomcc`
Use scoped threads in `std::sync::Barrier` examples
This removes boilerplate around `Arc`s and makes the code more clear.
…ark-Simulacrum
Update Code Example for `Iterator::rposition`
Added an additional assertion to the example to show the behavior of `iter.next_back` after using `iter.rposition`.
…5.0, r=Mark-Simulacrum
unwinding: bump version to fix naked_asm on Xous
With rust-lang#80608 the `unwinding` crate no longer builds. The upstream crate has been updated to build by manually adding directives to the naked_asm stream.
Bump the dependency in Rust to get this newer version. This fixes the build for Xous, and closesrust-lang#134403.
…or-types, r=tgross35
docs: inline `std::ffi::c_str` types to `std::ffi`
Rustdoc has no way to show that an item is stable, but only at a different path. `std::ffi::c_str::NulError` is not stable, but `std::ffi::NulError` is.
To avoid marking these types as unstable when someone just wants to follow a link from `CString`, inline them into their stable paths.
Fixesrust-lang#134702
r? `@tgross35`
@rustbotrustbot added O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. rollup A PR which is a rollup labels Dec 27, 2024
@jhpratt

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=5

@bors

bors commented Dec 27, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit c1447e3 has been approved by jhpratt

It is now in the queue for this repository.

@borsbors 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 27, 2024
@bors

bors commented Dec 27, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c1447e3 with merge 207ed1b...

@bors

bors commented Dec 27, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 207ed1b to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 27, 2024
@bors
bors merged commit 207ed1b into rust-lang:masterDec 27, 2024
@rustbotrustbot added this to the 1.85.0 milestone Dec 27, 2024
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#131522[macro_metavar_expr_concat] Fix #12834660991e37317b94c0fa00fa73eafab85f4de4d8b8 (link)
#134379Add into_array conversion destructors for Box, Rc, an…05f89ff7ad4d5cf65b4139f19c0c9ed3a14bc98d (link)
#134644Document collection From and FromIterator impls that dr…9386cfaaac8dd848595941567d041037264dfee5 (link)
#134649Fix forgetting to save statx availability on success81401c65834d4d8532a1677fba69d9f6b7352775 (link)
#134728Use scoped threads in std::sync::Barrier examples5051f3d9dc9cebec0be83018b599b275ed7d5245 (link)
#134782Update Code Example for Iterator::rpositiona3766b944ec9c204e50009cc0161e5f932d5b0e7 (link)
#134789unwinding: bump version to fix naked_asm on Xous37c48ed43395f729342dc00e36f48acda558e666 (link)
#134791docs: inline std::ffi::c_str types to std::ffi30460108a339897b446c881e900ba02c3406310f (link)

previous master: 917bfa7847

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (207ed1b): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-0.2%[-0.2%, -0.2%]1
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (primary 1.4%, secondary -0.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
1.4%[1.4%, 1.4%]1
Regressions ❌
(secondary)
2.0%[2.0%, 2.0%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-2.1%[-2.1%, -2.1%]1
All ❌✅ (primary)1.4%[1.4%, 1.4%]1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 764.398s -> 763.9s (-0.07%)
Artifact size: 330.51 MiB -> 330.55 MiB (0.01%)

@jhpratt
jhpratt deleted the rollup-a9klvez branch December 27, 2024 20:29
poliorcetics pushed a commit to poliorcetics/rust that referenced this pull request Dec 28, 2024
Rollup of 8 pull requests
Successful merges:
- rust-lang#131522 ([macro_metavar_expr_concat] Fixrust-lang#128346)
- rust-lang#134379 (Add `into_array` conversion destructors for `Box`, `Rc`, and `Arc`.)
- rust-lang#134644 (Document collection `From` and `FromIterator` impls that drop duplicate keys.)
- rust-lang#134649 (Fix forgetting to save statx availability on success)
- rust-lang#134728 (Use scoped threads in `std::sync::Barrier` examples)
- rust-lang#134782 (Update Code Example for `Iterator::rposition`)
- rust-lang#134789 (unwinding: bump version to fix naked_asm on Xous)
- rust-lang#134791 (docs: inline `std::ffi::c_str` types to `std::ffi`)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.O-unixOperating system: Unix-likerollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant 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.

ICE: transcribe: None

12 participants

@jhpratt@bors@rust-timer@rustbot@c410-f3r@bjoernager@kpreid@SUPERCILEX@deltragon@wtlin1228@xobs@notriddle