Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #105080

Merged
merged 12 commits into from Nov 30, 2022
Merged

Rollup of 5 pull requests #105080

merged 12 commits into from Nov 30, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

dingxiangfei2009 and others added 12 commits November 22, 2022 07:29
@dingxiangfei2009
restore control flow on error in EUV
daf93df
@haraldh
feat: implement TcpStream shutdown for wasm32-wasi
e598af6 
Signed-off-by: Harald Hoyer <harald@profian.com>
@dingxiangfei2009
inference test for rust-lang#104649
9cd12cd
@nnethercote
Add Nicholas Nethercote to .mailmap.
b788cb0 
Before:
```
$ git shortlog -se | grep Nethercote
   517	Nicholas Nethercote <n.nethercote@gmail.com>
     2	Nicholas Nethercote <nnethercote@apple.com>
   560	Nicholas Nethercote <nnethercote@mozilla.com>
```
After
```
$ git shortlog -se | grep Nethercote
  1079	Nicholas Nethercote <n.nethercote@gmail.com>
```
@nnethercote
Fix an ICE parsing a malformed literal in concat_bytes!.
bf4a62c 
Fixes rust-lang#104769.
@nnethercote
Add bors to .mailmap.
b2e05f6 
Before:
```
$ git shortlog -se | grep "\<bors\>"
 27755	bors <bors@rust-lang.org>
  5729	bors[bot] <26634292+bors[bot]@users.noreply.github.com>
   995	bors[bot] <bors[bot]@users.noreply.github.com>
```
After:
```
$ git shortlog -se | grep "\<bors\>"
 34479	bors <bors@rust-lang.org>
```
@nnethercote
Add dependabot to .mailmap.
3593a5d 
Before:
```
$ git shortlog -se | grep "depend"
    44	dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
     6	dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
     4	dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    74	dependabot[bot] <dependabot[bot]@users.noreply.github.com>
    93	dependabot[bot] <support@dependabot.com>
```
After:
```
$ git shortlog -se | grep "depend"
   221  dependabot[bot] <dependabot[bot]@users.noreply.github.com>
```
@matthiaskrgr
Rollup merge of rust-lang#104697 - dingxiangfei2009:fix-euv-control-f…
0c14551 
…low, r=oli-obk

Restore control flow on error in EUV

cc `@Nilstrieb`

Fix rust-lang#104649

Since rust-lang#98574 refactored a piece of scrutinee memory categorization out as a subroutine, there is a subtle change in handling match arms especially when the categorization process faults and bails. In the correct case, it is not supposed to continue to process the arms any more. This PR restores the original control flow in EUV.

I promise to add a compile-fail test to demonstrate that this indeed fixes the issue after coming back from a nap.
@matthiaskrgr
Rollup merge of rust-lang#104811 - haraldh:feat/wasm32_wasi_shutdown,…
c752eaa 
… r=joshtriplett

feat: implement TcpStream shutdown for wasm32-wasi

Signed-off-by: Harald Hoyer <harald@profian.com>
@matthiaskrgr
Rollup merge of rust-lang#105039 - nnethercote:fix-104769, r=petroche…
084bbcc 
…nkov

Fix an ICE parsing a malformed literal in `concat_bytes!`.

Fixes rust-lang#104769.

r? `@petrochenkov`
@matthiaskrgr
Rollup merge of rust-lang#105071 - nnethercote:nnethercote-mailmap, r…
bc820ec 
…=compiler-errors

Add Nicholas Nethercote to `.mailmap`.

Before:
```
$ git shortlog -se | grep Nethercote
   517	Nicholas Nethercote <n.nethercote@gmail.com>
     2	Nicholas Nethercote <nnethercote@apple.com>
   560	Nicholas Nethercote <nnethercote@mozilla.com>
```
After
```
$ git shortlog -se | grep Nethercote
  1079	Nicholas Nethercote <n.nethercote@gmail.com>
```
@matthiaskrgr
Rollup merge of rust-lang#105079 - nnethercote:bots-mailmap, r=jyn514
815b6e5 
Add bots to `.mailmap`

r? `@compiler-errors`
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. 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 Nov 30, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Nov 30, 2022

📌 Commit 815b6e5 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors 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 Nov 30, 2022
@bors
Copy link
Contributor

bors commented Nov 30, 2022

⌛ Testing commit 815b6e5 with merge a569a88...

@bors
Copy link
Contributor

bors commented Nov 30, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing a569a88 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 30, 2022
@bors bors merged commit a569a88 into rust-lang:master Nov 30, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 30, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#105079 92f67d86bd74862d3d5500af5ce3af879209cc09
#105071 8cb8881ffdb5ceadcdd5040cc7e99de8e4d623dc
#105039 ec9f8b75d54ee0b970236e1cd3954c2ab085d509
#104811 f591fd04cfe5677a702920c655d9d2d260d110c9
#104697 4329c991c7192d3393ba2a1f83f6158d5ddcdb8a

previous master: 8de4b13845

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

@bors bors mentioned this pull request Nov 30, 2022
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a569a88): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

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

mean range count
Regressions ❌
(primary)		 0.9% [0.8%, 1.0%] 2
Regressions ❌
(secondary)		 2.4% [2.1%, 2.8%] 6
Improvements ✅
(primary)		 -0.7% [-0.9%, -0.5%] 7
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.3% [-0.9%, 1.0%] 9

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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.6% [1.0%, 2.1%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.6% [-3.6%, -3.6%] 1
All ❌✅ (primary) - - 0

@rustbot rustbot added the perf-regression Performance regression. label Nov 30, 2022
@lqd
Copy link
Member

lqd commented Nov 30, 2022

cranelift-codegen, bitmaps, and keccak are currently noisy

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Nov 30, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-7ffj4oe branch December 22, 2022 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-meta Area: Issues about the rust-lang/rust repository. merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@matthiaskrgr @bors @rust-timer @lqd @rustbot @dingxiangfei2009 @haraldh @nnethercote