Skip to content

Rollup of 7 pull requests - #110522

Merged
bors merged 18 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-9m7rw3u
Apr 19, 2023
Merged

Rollup of 7 pull requests#110522
bors merged 18 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-9m7rw3u

Conversation

@matthiaskrgr

@matthiaskrgrmatthiaskrgr commented Apr 19, 2023

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkinand others added 18 commits April 17, 2023 14:23
@WaffleLapkin
Make IndexVec::ensure_contains_elem return a reference to the element
e1cd99f
@compiler-errors
Delay a good path bug for TypeErrCtxt
556062e
@WaffleLapkin
Don't allocate it IndexVec::remove
bd1dfce
@matthiaskrgr@compiler-errors
clippy: add test forrust-lang/rust-clippy#10645
c5e6ccb
@compiler-errors
Report reason why index impl is not satisfied deeply
770c303
@compiler-errors
Use a diagnostic item instead of filtering for Index::Output
d84b5f9
@compiler-errors
Test downstream errors from bad index expr
8d75a8f
@weihanglo
boostrap: print output during building tools
2c5867b
@kylematsuda
add EarlyBinder to return type of collect_return_position_impl_trait_…
522bc5f
…in_trait_tys query; remove bound_X version
@bryangarza
Fix ICE for transmutability in candidate assembly
238756e
Don't skip transmutability check just because there may be generics in the
ParamEnv.
Fixesrust-lang#110467
@Ezrashaw
make non_upper_case_globals lint not report trait impls
6256195
@matthiaskrgr
Rollup merge ofrust-lang#110432- compiler-errors:unsatisfied-index-…
3320b2a
…impl, r=cjgillot
Report more detailed reason why `Index` impl is not satisfied
Fixesrust-lang#110373
@matthiaskrgr
Rollup merge ofrust-lang#110451- WaffleLapkin:ensure_return_elem, r…
a184557
…=scottmcm
Minor changes to `IndexVec::ensure_contains_elem` & related methods
r? `@scottmcm`
@matthiaskrgr
Rollup merge ofrust-lang#110476- compiler-errors:ty-err-ctxt-good-p…
f20da94
…ath, r=lcnr
Delay a good path bug on drop for `TypeErrCtxt` (instead of a regular delayed bug)
r? `@lcnr`
Perhaps we should just delete the `Drop` impl altogether though?
Fixesrust-lang/rust-clippy#10645
`@matthiaskrgr:` I don't know how to make a clippy test for this. Any idea? Clippy's UI tests run with `-D warnings` and I have no idea how to switch it off to make a test that triggers this ICE in the clippy test suite 🤣
@matthiaskrgr
Rollup merge ofrust-lang#110498- kylematsuda:earlybinder-rpitit-tys…
9f0b16b
…, r=compiler-errors
Switch to `EarlyBinder` for `collect_return_position_impl_trait_in_trait_tys`
Part of the work to finish rust-lang#105779.
This PR adds `EarlyBinder` to the return type of the `collect_return_position_impl_trait_in_trait_tys` query and removes `bound_return_position_impl_trait_in_trait_tys`.
r? `@lcnr`
@matthiaskrgr
Rollup merge ofrust-lang#110507- weihanglo:print-try-run-output, r=…
e85b026
…jyn514
boostrap: print output during building tools
Fixesrust-lang#110506
@matthiaskrgr
Rollup merge ofrust-lang#110510- bryangarza:issue-110467-safe-trans…
fdd2f4b
…mute, r=compiler-errors
Fix ICE for transmutability in candidate assembly
Don't skip transmutability check just because there may be generics in the ParamEnv.
Fixesrust-lang#110467
@matthiaskrgr
Rollup merge ofrust-lang#110513- Ezrashaw:fix-trait-const-name-lint…
78490ad
…, r=compiler-errors
make `non_upper_case_globals` lint not report trait impls
We should not lint on trait `impl`s for `non_upper_case_globals`; the user doesn't have control over the name. This brings `non_upper_case_globals` into consistency with other `nonstandard_style` lints.
@rustbotrustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 19, 2023
@matthiaskrgr

matthiaskrgr commented Apr 19, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=7

@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 78490ad has been approved by matthiaskrgr

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 Apr 19, 2023
@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 78490ad with merge c781584...

@bors

bors commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2023
@bors
bors merged commit c781584 into rust-lang:masterApr 19, 2023
@rustbotrustbot added this to the 1.71.0 milestone Apr 19, 2023
@rust-timer

rust-timer commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#11051312cc7cc4246b164cb9275fb8ea7ec4897b05513e
#110510f866718a7e103e05f214169deb27c8afff92c5cf
#1105072904434ae64a9585bac2ce28a92d14ecce6ce5c4
#11049808763925a1ad58c608b7bf1f44786579c5cf1570
#1104763040eb59c2ea0828e08e7e39f12e106c98ab56b6
#11045121f7462bea416a4fe6ff9d7fa35b9db06e52e2b8
#110432312bfb0421609b65dc8538b4b871750bc9d1076b

previous master: 9e7f72c57d

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

@borsbors mentioned this pull request Apr 19, 2023
Merged
@rust-timer

rust-timer commented Apr 19, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (c781584): comparison URL.

Overall result: ✅ 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.

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

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.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.6%[2.6%, 2.6%]1
Improvements ✅
(primary)		-3.1%[-3.1%, -3.1%]1
Improvements ✅
(secondary)		-2.0%[-2.0%, -2.0%]1
All ❌✅ (primary)-3.1%[-3.1%, -3.1%]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.

meanrangecount
Regressions ❌
(primary)		--0
Regressions ❌
(secondary)		2.1%[2.1%, 2.1%]1
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		-2.6%[-2.8%, -2.4%]3
All ❌✅ (primary)--0

@matthiaskrgrmatthiaskrgr mentioned this pull request Nov 20, 2023
Closed
@matthiaskrgrmatthiaskrgr mentioned this pull request Feb 27, 2024
Closed
@matthiaskrgr
matthiaskrgr deleted the rollup-9m7rw3u branch March 16, 2024 18:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-query-systemArea: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html)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-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)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

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.

10 participants

@matthiaskrgr@bors@rust-timer@rustbot@WaffleLapkin@compiler-errors@weihanglo@kylematsuda@bryangarza@Ezrashaw