Skip to content

Rollup of 5 pull requests#101479

Merged
bors merged 15 commits intorust-lang:masterfrom
Dylan-DPC:rollup-v8ite0y
Sep 6, 2022
Merged

Rollup of 5 pull requests#101479
bors merged 15 commits intorust-lang:masterfrom
Dylan-DPC:rollup-v8ite0y

Conversation

@Dylan-DPC
Copy link
Member

@Dylan-DPC Dylan-DPC commented Sep 6, 2022

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Adam-Gleave and others added 15 commits September 1, 2022 16:09
Document eager evaluation of bool::then_some argument
9d0542b
@MingyuChen1
Migrate DropCheckOverflow
3e834a7
@MingyuChen1
Migrate OpaqueHiddenType mismatch
00cd965
@MingyuChen1
Migrate limit error
b37e645
Remove trailing whitespace
33afe97
@WaffleLapkin
remove some integer casts from slice iter
fff92d5
@WaffleLapkin
replace as usize casts with usize::from in slice sort
5a67292
@MingyuChen1
fix comment
a42c0d7
@compiler-errors
Fix ICE, generalize 'move generics to trait' suggestion for >0 non-rc…
bee48e3 
…vr arguments
@chenyukang
get_attr should check that no duplicates are allowed
00b10a5
@Dylan-DPC
Rollup merge of rust-lang#100658 - chenyukang:100631-check-get-attr, …
3f22020 
…r=lcnr

TyCtxt::get_attr should check that no duplicates are allowed

Fixes rust-lang#100631
@Dylan-DPC
Rollup merge of rust-lang#101021 - MingyuChen1:diagnostic, r=davidtwco
36144f2 
Migrate ``rustc_middle`` diagnostic

Part of rust-lang#100717
@Dylan-DPC
Rollup merge of rust-lang#101287 - Adam-Gleave:doc_bool_then_some, r=…
24f9989 
…scottmcm

Document eager evaluation of `bool::then_some` argument

I encountered this earlier today and thought maybe `bool::then_some` could use a little addition to the documentation.

It's pretty obvious with familiarity and from looking at the implementation, but the argument for `then_some` is eagerly evaluated, which means if you do the following (as I did), you can have a problem:

```rust
// Oops!
let _ = something
    .has_another_thing()
    .then_some(something.another_thing_or_panic());
```

A note, similar to other methods with eagerly-evaluated arguments and a lazy alternative (`Option::or`, for example), could help point this out to people who forget (like me)!
@Dylan-DPC
Rollup merge of rust-lang#101412 - WaffleLapkin:improve_std_ptr_code_…
00db13f 
…leftovers, r=scottmcm

Some more cleanup in `core`

- remove some integer casts from slice iter (proposed in rust-lang#100819 (comment))
- replace `as usize` casts with `usize::from` in slice sort (proposed in rust-lang#100822 (comment))

r? `@scottmcm`
@Dylan-DPC
Rollup merge of rust-lang#101427 - compiler-errors:issue-101421, r=cj…
8936211 
…gillot

Fix ICE, generalize 'move generics to trait' suggestion for >0 non-rcvr arguments

Fixes rust-lang#101421
cc rust-lang#100838
@rustbot rustbot 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. rollup A PR which is a rollup labels Sep 6, 2022
@Dylan-DPC
Copy link
Member Author

Dylan-DPC commented Sep 6, 2022

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Sep 6, 2022

📌 Commit 8936211 has been approved by Dylan-DPC

It is now in the queue for this repository.

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

bors commented Sep 6, 2022

⌛ Testing commit 8936211 with merge 3c72788...

@bors
Copy link
Collaborator

bors commented Sep 6, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 6, 2022
@bors bors merged commit 3c72788 into rust-lang:master Sep 6, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 6, 2022
@rust-timer
Copy link
Collaborator

rust-timer commented Sep 6, 2022

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#101427 b16279a2599df1073aa3d49878a243050d70356c
#101412 d8ebbb9112104fc4b7a9ec4f08e88b10ed5c65c5
#101287 c1e6154b6c3a524b8167915b44ecd4d33e14cf25
#101021 733a5cba84d17c2092b91557e645918435400792
#100658 d31e77d12a9ebde7353e4a24057c6c13d34520a4

previous master: a594044533

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

This was referenced Sep 6, 2022
Merged
Merged
@bors bors mentioned this pull request Sep 6, 2022
Closed
@rust-timer
Copy link
Collaborator

rust-timer commented Sep 6, 2022

Finished benchmarking commit (3c72788): 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.

mean1 range count2
Regressions ❌
(primary)		 0.9% [0.4%, 1.3%] 10
Regressions ❌
(secondary)		 1.3% [0.8%, 1.8%] 8
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.4% [-1.6%, -1.2%] 6
All ❌✅ (primary) 0.9% [0.4%, 1.3%] 10

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.

mean1 range count2
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -3.4% [-3.4%, -3.4%] 1
Improvements ✅
(secondary)		 -2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -3.4% [-3.4%, -3.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.

mean1 range count2
Regressions ❌
(primary)		 2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.3% [2.3%, 2.3%] 1

Footnotes

  1. the arithmetic mean of the percent change ↩ ↩2 ↩3

  2. number of relevant changes ↩ ↩2 ↩3

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

lqd commented Sep 6, 2022

Looks like the current noise/bimodality of html5ever-0.26.0, serde_derive-1.0.136, tt-muncher, keccak.

@nnethercote
Copy link
Contributor

nnethercote commented Sep 6, 2022

I agree with @lqd that this is probably actually perf-neutral.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Sep 6, 2022
@davidtwco davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
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

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.65.0

Development

Successfully merging this pull request may close these issues.