Skip to content

Rollup of 6 pull requests - #96253

Merged
bors merged 15 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-87hpds5
Apr 20, 2022
Merged

Rollup of 6 pull requests#96253
bors merged 15 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-87hpds5

Conversation

@Dylan-DPC

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tmiaskoand others added 15 commits March 24, 2022 23:56
The existing description was incorrect for socket addresses, and
misleading: users would see “invalid IP address syntax” and suppose they
were supposed to provide an IP address rather than a socket address.
I contemplated making it two variants (IP, socket), but realised we can
do still better for the IPv4 and IPv6 types, so here it is as six.
I contemplated more precise error descriptions (e.g. “invalid IPv6
socket address syntax: expected a decimal scope ID after %”), but that’s
a more invasive change, and probably not worthwhile anyway.
Check if call return type is visibly uninhabited when building MIR
The main motivation behind the change is to expose information about diverging
calls to the generator transform and match the precision of drop range tracking
which already understands that call expressions with visibly uninhabited types
diverges.
This change should also accept strictly more programs than before. That is
programs that were previously rejected due to errors raised by control-flow
sensitive checks in a code that is no longer considered reachable.
Fixesrust-lang#93161.
Miri/interpreter debugging tweaks
Some changes I made to make debugging Miri with trace logging less terrible.
r? ``@oli-obk``
…thomcc
Replace sys/unix/weak AtomicUsize with AtomicPtr
Should fixrust-lang#96163. Can't easily test on Windows though...
…tion-improvements, r=joshtriplett
Improve AddrParseError description
The existing description was incorrect for socket addresses, and misleading: users would see “invalid IP address syntax” and suppose they were supposed to provide an IP address rather than a socket address.
I contemplated making it two variants (IP, socket), but realised we can do still better for the IPv4 and IPv6 types, so here it is as six.
I contemplated more precise error descriptions (e.g. “invalid IPv6 socket address syntax: expected a decimal scope ID after %”), but that’s a more invasive change, and probably not worthwhile anyway.
…chton
Use sys::unix::locks::futex* on wasm+atomics.
This removes the wasm-specific lock implementations and instead re-uses the implementations from sys::unix.
Tracking issue: rust-lang#93740
cc ``@alexcrichton``
remove_dir_all_recursive: treat ELOOP the same as ENOTDIR
On older Linux kernels (I tested on 4.4, corresponding to Ubuntu 16.04), opening a symlink using `O_DIRECTORY | O_NOFOLLOW` returns `ELOOP` instead of `ENOTDIR`. We should handle it the same, since a symlink is still not a directory and needs to be `unlink`ed.
@rustbotrustbot added 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 Apr 20, 2022
@Dylan-DPC

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Apr 20, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 2443cf2 has been approved by Dylan-DPC

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

bors commented Apr 20, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2443cf2 with merge 51ea9bb...

@bors

bors commented Apr 20, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 51ea9bb to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 20, 2022
@bors
bors merged commit 51ea9bb into rust-lang:masterApr 20, 2022
@rustbotrustbot added this to the 1.62.0 milestone Apr 20, 2022
@Dylan-DPC
Dylan-DPC deleted the rollup-87hpds5 branch April 20, 2022 21:23
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (51ea9bb): comparison url.

Summary:

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)
Regressions 😿
(secondary)
Improvements 🎉
(primary)
Improvements 🎉
(secondary)
All 😿 🎉
(primary)
count103000
mean2N/A0.5%N/AN/AN/A
maxN/A0.6%N/AN/AN/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. number of relevant changes

  2. the arithmetic mean of the percent change

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@Dylan-DPC@bors@rust-timer@rustbot@tmiasko@RalfJung@CAD97@chris-morgan@m-ou-se@goffrie