Rollup of 6 pull requests by Dylan-DPC · Pull Request #101560 · rust-lang/rust

Dylan-DPC · 2022-09-08T06:25:11Z

Successful merges:

Migrate another part of rustc_infer to session diagnostic #101153 (Migrate another part of rustc_infer to session diagnostic)
Shrink span for bindings with subpatterns. #101399 (Shrink span for bindings with subpatterns.)
Hermit: Add File::set_time stub #101422 (Hermit: Add File::set_time stub)
Avoid UB in the Windows filesystem code in... bootstrap? #101455 (Avoid UB in the Windows filesystem code in... bootstrap?)
rustc: Parameterize ty::Visibility over used ID #101498 (rustc: Parameterize ty::Visibility over used ID)
Use HashStable_Generic in rustc_type_ir #101549 (Use HashStable_Generic in rustc_type_ir)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

This is not supported on hermit yet. This change is required for compiling std.

…feasible

Co-authored-by: David Wood <agile.lion3441@fuligin.ink>

…now supported by them

It allows using `LocalDefId` instead of `DefId` when possible, and also encode cheaper `Visibility<DefIndex>` into metadata.

A lot of the types in this crate implemented HashStable directly to avoid circular dependencies. One way around that is to use HashStable_Generic. We adopt that here to avoid a lot of boilerplate. This doesn't update all the types, because some would require `I: Interner + HashStable`.

…avidtwco Migrate another part of rustc_infer to session diagnostic Probably will migrate another file before marking this one as ready-to-merge. `@rustbot` label +A-translation r? rust-lang/diagnostics cc rust-lang#100717

…estebank Shrink span for bindings with subpatterns. Bindings with nested patterns (`binding @ pat` syntax) currently point to the full pattern. This PR proposes to shrink the span to stop before the ````@`.``` This makes the diagnostics for move/mutability conflicts clearer, as they not point to the `binding` only, instead of the full pat. r? ```@estebank```

…triplett Hermit: Add File::set_time stub This is not supported on hermit yet. This change is required for compiling std.

Avoid UB in the Windows filesystem code in... bootstrap? This basically a subset of the changes from rust-lang#101171. I didn't think to look in src/bootstrap for more windows filesystem API usage, which was apparently a mistake on my part. It's kinda goofy that stuff like this is in here, but what are you gonna do, computers are awful. I also added `winbase` to the `winapi` dep -- I tested this in a tmp crate but needed to add this to your Cargo.toml -- you `use winapi::stuff::winbase` in this function, but are relying on something else turning on that feature.

rustc: Parameterize `ty::Visibility` over used ID It allows using `LocalDefId` instead of `DefId` when possible, and also encode cheaper `Visibility<DefIndex>` into metadata.

…neric, r=jackh726 Use HashStable_Generic in rustc_type_ir A lot of the types in this crate implemented HashStable directly to avoid circular dependencies. One way around that is to use HashStable_Generic. We adopt that here to avoid a lot of boilerplate. This doesn't update all the types, because some would require `I: Interner + HashStable`. r? `@cjgillot`

Dylan-DPC · 2022-09-08T06:25:50Z

@bors r+ rollup=never p=5

bors · 2022-09-08T06:25:51Z

📌 Commit 7f46d73 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-09-08T08:01:01Z

⌛ Testing commit 7f46d73 with merge b42244c...

bors · 2022-09-08T10:29:47Z

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

rust-timer · 2022-09-08T10:31:45Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101549	6fb8f66c8966872684f0306a4b7e705ccef55f5d
#101498	a616e22339f7e4b5f1b96d3311420a12df26b7bf
#101455	07838ff3c532a3938c3ab12934736ec0acd77895
#101422	2fed4c7818ac7f4398d671010690c5dc8d4cccbb
#101399	3d74ee142a08340a7bfbed0debee496867076eee
#101153	2d0239e1a5f798497b3a5ccda23c588e9eec1429

previous master: 44adfccffe

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 · 2022-09-08T13:16:04Z

Finished benchmarking commit (b42244c): comparison URL.

Overall result: ❌ regressions - 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)	1.1%	[1.1%, 1.1%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[1.1%, 1.1%]	2

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)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.8%	[-7.9%, -2.3%]	8
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)	3.5%	[3.5%, 3.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.6%	[-2.3%, 3.5%]	2

the arithmetic mean of the percent change↩↩² ↩³
number of relevant changes↩↩² ↩³

mkroeningand others added 19 commits September 5, 2022 00:17

Hermit: Add File::set_time stub
3b985b4
This is not supported on hermit yet. This change is required for compiling std.

Avoid UB in the Windows filesystem code in... bootstrap?
850090d

Migrate E0623
af3343a

Mugrate mismatched_static_lifetime.rs
e0e9b21

Address some comments
3190522

Remove a comment and use IntoDiagnosticArg instead of add_to() where …
e750d7f
…feasible

Use untranslated messages for now
59c5672

Slightly more concise comment
cb7ad9e
Co-authored-by: David Wood <agile.lion3441@fuligin.ink>

Shrink span for bindings with subpatterns.
5d94d42

Replace manual impl with a derive macro as multipart suggestions are …
ee74f92
…now supported by them

Whoops forgot a space
3d70be7

rustc: Parameterize ty::Visibility over used ID
d8d3b83
It allows using `LocalDefId` instead of `DefId` when possible, and also encode cheaper `Visibility<DefIndex>` into metadata.

Rollup merge ofrust-lang#101422- mkroening:hermit-file-time, r=josh…
7064344
…triplett Hermit: Add File::set_time stub This is not supported on hermit yet. This change is required for compiling std.

Rollup merge ofrust-lang#101498- petrochenkov:visparam, r=cjgillot
12b8100
rustc: Parameterize `ty::Visibility` over used ID It allows using `LocalDefId` instead of `DefId` when possible, and also encode cheaper `Visibility<DefIndex>` into metadata.

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 8, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2022

bors merged commit b42244c into rust-lang:masterSep 8, 2022

rustbot added this to the 1.65.0 milestone Sep 8, 2022

Dylan-DPC deleted the rollup-8m8yr89 branch September 8, 2022 10:41

This was referenced Sep 8, 2022
Remove ReEmpty #98559
Merged
RFC 2145: Type privacy and private-in-public lints #100962
Closed
Emit a note that static bounds from HRTBs are a bug #101433
Merged

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #101560

Rollup of 6 pull requests#101560
bors merged 19 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-8m8yr89

Dylan-DPC commented Sep 8, 2022

Uh oh!

Dylan-DPC commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

rust-timer commented Sep 8, 2022

Uh oh!

rust-timer commented Sep 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Uh oh!

Conversation

Dylan-DPC commented Sep 8, 2022

Uh oh!

Dylan-DPC commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

bors commented Sep 8, 2022

Uh oh!

rust-timer commented Sep 8, 2022

Uh oh!

rust-timer commented Sep 8, 2022

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants