Skip to content

Migrating rustc_infer to session diagnostics (part 5) - #108698

Merged
bors merged 16 commits into
rust-lang:masterfrom
IntQuant:issue-100717-infer-6
Apr 10, 2023
Merged

Migrating rustc_infer to session diagnostics (part 5)#108698
bors merged 16 commits into
rust-lang:masterfrom
IntQuant:issue-100717-infer-6

Conversation

@IntQuant

@IntQuantIntQuant commented Mar 3, 2023

Copy link
Copy Markdown
Contributor

@rustbot label +A-translation
cc #100717

@rustbot

rustbot commented Mar 3, 2023

Copy link
Copy Markdown
Collaborator

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. labels Mar 3, 2023
@IntQuant

IntQuant commented Mar 3, 2023

Copy link
Copy Markdown
ContributorAuthor

r? rust-lang/diagnostics

@rustbotrustbot assigned davidtwco and unassigned wesleywiserMar 3, 2023
@IntQuant
IntQuantforce-pushed the issue-100717-infer-6 branch from d1e7ac4 to b06f707CompareMarch 3, 2023 13:30
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant
IntQuantforce-pushed the issue-100717-infer-6 branch from 8b3268a to 26b7873CompareMarch 4, 2023 11:10
@IntQuant
IntQuant marked this pull request as ready for review March 4, 2023 15:10
davidtwco
davidtwco requested changes Mar 9, 2023
View reviewed changes
Comment threadcompiler/rustc_infer/src/errors/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/errors/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/errors/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/errors/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/errors/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/error_reporting/suggest.rs Outdated
@IntQuant
IntQuantforce-pushed the issue-100717-infer-6 branch from 14a2411 to d96f540CompareMarch 11, 2023 14:40
@bors

bors commented Mar 12, 2023

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #108682) made this pull request unmergeable. Please resolve the merge conflicts.

@IntQuant
IntQuantforce-pushed the issue-100717-infer-6 branch from d96f540 to 39478c9CompareMarch 12, 2023 09:21
IntQuantand others added 14 commits April 4, 2023 18:34
@IntQuant
Ported FunctionPointerSuggestion
37f5569
@IntQuant
Migrate SuggestAsRefWhereAppropriate
b36abea
@IntQuant
Migrate SuggestAccessingField
d56b304
@IntQuant
Migrate SuggestBoxingForReturnImplTrait, Fix typo in infer_fn_conside…
23b8567
…r_casting
@IntQuant
Migrate SuggestTuplePattern
d18adb7
@IntQuant
Migrate TupleTrailingCommaSuggestion
b610ce7
@IntQuant
FailureCode::Error0038 is unreachable, so can be removed
ab11b43
@IntQuant
Migrate (most of) report_and_explain_type_error
1f09bc7
@IntQuant@davidtwco
Update compiler/rustc_infer/src/infer/error_reporting/suggest.rs
e813b6d
Co-authored-by: David Wood <agile.lion3441@fuligin.ink>
@IntQuant
Move and document escape_literal function
aa33a6f
@IntQuant
Renamed TypeErrorAdditionalDiags (was Error0308Subdiags) and Obligati…
fd18d9a
…onCauseFailureCode (was FailureCodeDiagnostics)
@IntQuant
A more general implementation of IntoDiagnosticArg for Binder (Al…
6a05cd8
…so removes `DiagArg`, as it's no longer necessary)
@IntQuant
Extract suggest_specify_actual_length into a separate function
21d5bed
@IntQuant
Rename tuple_wrap_err_subdiag to suggest_wrap_to_build_a_tuple, makin…
467d367
…g it more consistent with similar functions
@IntQuant
IntQuantforce-pushed the issue-100717-infer-6 branch from 39478c9 to 467d367CompareApril 4, 2023 15:50
@rust-log-analyzer

This comment has been minimized.

Sign in to view
davidtwco
davidtwco approved these changes Apr 10, 2023
View reviewed changes

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the delay in getting back to this, one last comment then r=me.

Comment threadcompiler/rustc_middle/src/ty/sty.rs Outdated
@davidtwco

davidtwco commented Apr 10, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Apr 10, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit d07b1cd has been approved by davidtwco

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 10, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 10, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108698- IntQuant:issue-100717-infer-6, r=d…
f2c7257
…avidtwco
Migrating rustc_infer to session diagnostics (part 5)
`@rustbot` label +A-translation
cc rust-lang#100717
@Dylan-DPCDylan-DPC mentioned this pull request Apr 10, 2023
Closed
@bors

bors commented Apr 10, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit d07b1cd with merge 88fb1b9...

@bors

bors commented Apr 10, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing 88fb1b9 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2023
@bors
bors merged commit 88fb1b9 into rust-lang:masterApr 10, 2023
@rustbotrustbot added this to the 1.70.0 milestone Apr 10, 2023
@borsbors mentioned this pull request Apr 10, 2023
Closed
6 tasks
@rust-timer

rust-timer commented Apr 10, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (88fb1b9): 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.3%[-0.3%, -0.3%]1
Improvements ✅
(secondary)		--0
All ❌✅ (primary)-0.3%[-0.3%, -0.3%]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.8%[0.6%, 0.9%]3
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		-0.5%[-0.5%, -0.5%]1
Improvements ✅
(secondary)		-5.0%[-6.6%, -3.4%]2
All ❌✅ (primary)0.4%[-0.5%, 0.9%]4

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.4%[0.4%, 0.4%]1
Regressions ❌
(secondary)		4.1%[3.2%, 4.9%]2
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)0.4%[0.4%, 0.4%]1

@IntQuantIntQuant mentioned this pull request Apr 29, 2023
Open
84 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidtwcodavidtwcodavidtwco approved these changes

Assignees

@davidtwcodavidtwco

Labels

A-translationArea: Translation infrastructure, and migrating existing diagnostics to SessionDiagnosticmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

7 participants

@IntQuant@rustbot@bors@rust-log-analyzer@davidtwco@rust-timer@wesleywiser