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.

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

Rollup of 10 pull requests #123098

Merged
merged 21 commits into from Mar 26, 2024
Merged

Rollup of 10 pull requests #123098

merged 21 commits into from Mar 26, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bvanjoi and others added 21 commits March 20, 2024 18:04
We have to make sure we set it everywhere that we set `subcandidates`.
`trait_object_ty` assumed that associated types would be fully
determined by the trait. This is *almost* true - const parameters and
type parameters are no longer allowed, but lifetime parameters are.
Since we erase all lifetime parameters anyways, instantiate it with as
many erased regions as it needs.

Fixes: rust-lang#123053
store segment and module in `UnresolvedImportError`

Fixes rust-lang#115185

An easy fix. r? `@Nilstrieb`
…llot

simplify_branches: add comment

I am not quite sure why this simplification is done here and not in InstSimplify but 🤷

r? `@cjgillot`
…ease

triagebot: Add notification of 2024 issues

This adds a notification for 2024 issues to Zulip.
…compiler-errors

CFI: (actually) check that methods are object-safe before projecting their receivers to `dyn Trait` in CFI

`trait_object_ty` assumed that associated types would be fully determined by the trait. This is *almost* true - const parameters and type parameters are no longer allowed, but lifetime parameters are. Since we erase all lifetime parameters anyways, instantiate it with as many erased regions as it needs.

Fixes: rust-lang#123053

r? `@compiler-errors`
…i-obk

match lowering: consistently merge simple or-patterns

There are two places where we expand or-patterns in match lowering: the main one is `test_candidates_with_or`, and there's one in `match_candidates` that's an optimization for the simple case where the whole pattern is just one or-pattern.

To reduce duplication, we merge or-pattern alternatives into a single block when possible, but we only to that in `test_candidates_with_or`. This PR fixes this oversight and merges them in `match_candidates` too.

This is a part of splitting up rust-lang#122046 into smaller bits.
…=Kobzol

Revert `cargo update` changes and bump `download-artifact` to v4

Revert rust-lang#122489 and rust-lang#122698

rust-lang#122951 (comment)
The failures + rust-lang/rust-log-analyzer#81 are causing some annoying spam. I don't think this is _that_ important for now and I don't know enough GHA to fix it 😓
…=the8472

Fix doc link to BufWriter in std::fs::File documentation

It seems that doc link to `BufWriter` in `std::fs::File` doc leads to `BufReader`, not `BufWriter`.
See https://doc.rust-lang.org/std/fs/struct.File.html
Remove `CacheSelector` trait now that we can use GATs

No change in behaviour. Just noticed while digging around in the query infrastructure
…ochenkov

Delegation: fix ICE on wrong `self` resolution

fixes rust-lang#122874

Delegation item should be wrapped in a `rib` to behave like a regular function during name resolution.

r? `@petrochenkov`
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) PG-exploit-mitigations Project group: Exploit mitigations 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 Mar 26, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Mar 26, 2024

📌 Commit 4d1fb9e 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 Mar 26, 2024
@bors
Copy link
Contributor

bors commented Mar 26, 2024

⌛ Testing commit 4d1fb9e with merge 3b370cf...

@bors
Copy link
Contributor

bors commented Mar 26, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2024
@bors bors merged commit 3b370cf into rust-lang:master Mar 26, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 26, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#122766 store segment and module in UnresolvedImportError 343444e12064d89b0ef0abdfee783ef3efc1668d (link)
#122996 simplify_branches: add comment fd839b07c76f5e639daefab1fdc27a1deb7c5119 (link)
#123047 triagebot: Add notification of 2024 issues 7b1d77ee773ddea643a6aa08a252090edd61cba3 (link)
#123066 CFI: (actually) check that methods are object-safe before p… 2283ec72a480cda2bc4fa742a8d8693f11d6ba8c (link)
#123067 match lowering: consistently merge simple or-patterns 7d28c582e8788525e0c881cec94ed2fac68a3e91 (link)
#123069 Revert cargo update changes and bump download-artifact c847e96c5a6f052f5c116ef9c8dfd9d01ea7afe0 (link)
#123070 Add my former address to .mailmap 6ef03d1a597db9597c2d63edf942fb9b1b0dfd80 (link)
#123086 Fix doc link to BufWriter in std::fs::File documentation bf2c2a334351470cd51d2bb511175782ca5ed5bc (link)
#123090 Remove CacheSelector trait now that we can use GATs 96f7047f519edb6f4c19e81a5dd1daa27189e5e3 (link)
#123091 Delegation: fix ICE on wrong self resolution 0d06245782829d96e09f759ed374e04b3dd15e5f (link)

previous master: 536606bc5d

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

@rust-timer
Copy link
Collaborator

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

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.3% [3.3%, 3.3%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 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.

mean range count
Regressions ❌
(primary)
2.1% [2.1%, 2.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.6% [-3.0%, -1.2%] 13
Improvements ✅
(secondary)
-3.0% [-3.4%, -2.6%] 2
All ❌✅ (primary) -1.4% [-3.0%, 2.1%] 14

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)
-1.1% [-3.0%, -0.4%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.1% [-3.0%, -0.4%] 4

Binary size

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

Bootstrap: 671.741s -> 671.136s (-0.09%)
Artifact size: 315.68 MiB -> 315.73 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues about the rust-lang/rust repository. A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations 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
Development

Successfully merging this pull request may close these issues.

None yet