Skip to content

Rollup of 8 pull requests - #102450

Merged
bors merged 24 commits into
rust-lang:masterfrom
JohnTitor:rollup-ahleg93
Sep 29, 2022
Merged

Rollup of 8 pull requests#102450
bors merged 24 commits into
rust-lang:masterfrom
JohnTitor:rollup-ahleg93

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

sunfishcodeand others added 24 commits August 29, 2022 08:31
`std::os::fd` defines types like `OwnedFd` and `RawFd` and is common
between Unix and non-Unix platforms that share a basic file-descriptor
concept. Rust currently uses this internally to simplify its own code,
but it would be useful for external users in the same way, so make it
public.
This means that `OwnedFd` etc. will all appear in three places, for
example on unix platforms:
- `std::os::fd::OwnedFd`
- `std::os::unix::io::OwnedFd`
- `std::os::unix::prelude::OwnedFd`
Add `#[unstable(feature = "os_fd", issue = "98699")]` to the new
`pub use` declarations.
…r=joshtriplett
Make `std::os::fd` public.
`std::os::fd` defines types like `OwnedFd` and `RawFd` and is common
between Unix and non-Unix platforms that share a basic file-descriptor
concept. Rust currently uses this internally to simplify its own code,
but it would be useful for external users in the same way, so make it
public.
This means that `OwnedFd` etc. will all appear in three places, for
example on unix platforms:
- `std::os::fd::OwnedFd`
- `std::os::unix::io::OwnedFd`
- `std::os::unix::prelude::OwnedFd`
r? `````@joshtriplett`````
Code refactoring smart_resolve_report_errors
`smart_resolve_report_errors` https://github.com/rust-lang/rust/blob/4ecfdfac51b159f68fce608792affb34a70e6f73/compiler/rustc_resolve/src/late/diagnostics.rs#L143
is almost 600 lines of code, we should do some code refactoring.
Add a niche to `Duration`, unix `SystemTime`, and non-apple `Instant`
As the nanoseconds fields is always between `0` and `(NANOS_PER_SEC - 1)` inclusive, use the `rustc_layout_scalar_valid_range` attributes to create a niche in the nanosecond field of `Duration` and `Timespec` (which is used to implement unix `SystemTime` and non-apple unix `Instant`; windows `Instant` is implemented with `Duration` and therefore will also benefit). This change has the benefit of making `Option<T>` the same size as `T` for the previously mentioned types. Also shrinks the nanoseconds field of `Timespec` to a `u32` as nanoseconds do not need the extra range of an `i64`, shrinking `Timespec` by 4 bytes on 32-bit platforms.
r? ```@joshtriplett```
…issue-94923, r=JohnTitor
Add regression test for issue 94923
Fixesrust-lang#94923
Account for use of index-based lifetime names in print of binder
Fixesrust-lang#102374
r? ```@lcnr```
cc ```@steffahn```
…ler-errors
remove FIXME, improve documentation
r? types
@rustbotrustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 29, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Sep 29, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 5c731cd has been approved by JohnTitor

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 29, 2022
@bors

bors commented Sep 29, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5c731cd with merge 1536a53...

@bors

bors commented Sep 29, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 1536a53 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2022
@bors
bors merged commit 1536a53 into rust-lang:masterSep 29, 2022
@rustbotrustbot added this to the 1.66.0 milestone Sep 29, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (1536a53): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
1.4%[1.3%, 1.6%]3
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
-1.0%[-1.0%, -1.0%]1
All ❌✅ (primary)--0

Max RSS (memory usage)

Results

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.

mean1rangecount2
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
2.4%[2.3%, 2.5%]2
Improvements ✅
(primary)
-2.4%[-2.4%, -2.4%]1
Improvements ✅
(secondary)
--0
All ❌✅ (primary)-2.4%[-2.4%, -2.4%]1

Cycles

Results

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.

mean1rangecount2
Regressions ❌
(primary)
3.0%[3.0%, 3.0%]1
Regressions ❌
(secondary)
4.7%[4.7%, 4.7%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)3.0%[3.0%, 3.0%]1

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

@davidtwcodavidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
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.rollupA 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.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

12 participants

@JohnTitor@bors@rust-timer@davidtwco@rustbot@sunfishcode@chenyukang@Rageking8@b-naber@lcnr@beetrees@RalfJung