Suggest let for assignment, and some code refactor #101908

chenyukang · 2022-09-16T16:34:00Z

Fixes #101880

rust-highfive · 2022-09-16T16:34:03Z

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

src/test/ui/suggestions/suggest-let-for-assignment.stderr

compiler/rustc_resolve/src/late/diagnostics.rs

src/test/ui/suggestions/suggest-let-for-assignment.stderr

compiler/rustc_resolve/src/late/diagnostics.rs

chenyukang · 2022-09-17T01:00:52Z

By the way, smart_resolve_report_errors is tooo long and seems hard to maintain 😂
Should we refactor this part? @estebank

src/test/ui/suggestions/suggest-let-for-assignment.stderr

compiler/rustc_resolve/src/late/diagnostics.rs

estebank · 2022-09-19T15:33:50Z

By the way, smart_resolve_report_errors is tooo long and seems hard to maintain 😂 Should we refactor this part?

We should, but better to do it as part of its own PR.

bors · 2022-09-29T08:36:02Z

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

chenyukang · 2022-10-14T02:08:31Z

r? @estebank

bors · 2022-10-20T14:12:43Z

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

estebank

r=me after rebasing (ping me and I'll approve)

estebank · 2022-10-21T02:09:19Z

compiler/rustc_resolve/src/late/diagnostics.rs

+                            let has_eq = matches!(sm.span_to_snippet(eq_span), Ok(ref snippet) if snippet == "=");
+                            if has_eq {


This can now be written as follows

Suggested change

let has_eq = matches!(sm.span_to_snippet(eq_span), Ok(ref snippet) if snippet == "=");

if has_eq {

if let Ok(ref snippet) = sm.span_to_snippet(eq_span) && snippet == "=" {

estebank · 2022-10-21T02:10:16Z

compiler/rustc_resolve/src/late/diagnostics.rs

+                let ident_name = sm.span_to_snippet(ident_span).unwrap();
+                if sm
+                    .span_to_snippet(line_span)
+                    .map_or(false, |s| s.trim().starts_with(&ident_name))


Is this check to protect against macros or something else?

Ah, yes. Saw the dbg!(binding) case in the test. Hacky, but makes sense!

emm, I will add a comment for this.

chenyukang · 2022-10-21T09:05:24Z

compiler/rustc_resolve/src/late/diagnostics.rs

-                break;
-            }
-        }
+        let closing_span = sm.span_look_ahead(span, Some("}"), Some(50));


Since the next_point bug is fixed, this is changed from 100 to 50 😂

chenyukang · 2022-10-21T09:06:22Z

r? @estebank

estebank · 2022-10-21T21:22:29Z

@bors r+

bors · 2022-10-21T21:22:32Z

📌 Commit eb68e27 has been approved by estebank

It is now in the queue for this repository.

Suggest let for assignment, and some code refactor Fixes rust-lang#101880

Rollup of 6 pull requests Successful merges: - rust-lang#101293 (Recover when unclosed char literal is parsed as a lifetime in some positions) - rust-lang#101908 (Suggest let for assignment, and some code refactor) - rust-lang#103192 (rustdoc: Eliminate uses of `EarlyDocLinkResolver::all_traits`) - rust-lang#103226 (Check `needs_infer` before `needs_drop` during HIR generator analysis) - rust-lang#103249 (resolve: Revert "Set effective visibilities for imports more precisely") - rust-lang#103305 (Move some tests to more reasonable places) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Kaligule · 2022-10-28T07:51:21Z

Thank you @chenyukang

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 16, 2022

rust-highfive assigned oli-obk Sep 16, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2022

Rageking8 reviewed Sep 16, 2022

View reviewed changes

src/test/ui/suggestions/suggest-let-for-assignment.stderr Outdated Show resolved Hide resolved

chenyukang marked this pull request as draft September 16, 2022 16:56

This comment has been minimized.

Sign in to view

estebank reviewed Sep 16, 2022

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Outdated Show resolved Hide resolved

estebank reviewed Sep 16, 2022

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Outdated Show resolved Hide resolved

estebank reviewed Sep 16, 2022

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Outdated Show resolved Hide resolved

estebank reviewed Sep 16, 2022

View reviewed changes

src/test/ui/suggestions/suggest-let-for-assignment.stderr Outdated Show resolved Hide resolved

estebank reviewed Sep 16, 2022

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Outdated Show resolved Hide resolved

chenyukang force-pushed the fix-101880 branch from b62b110 to 1a76ead Compare September 17, 2022 05:36

chenyukang commented Sep 17, 2022

View reviewed changes

src/test/ui/suggestions/suggest-let-for-assignment.stderr Show resolved Hide resolved

chenyukang marked this pull request as ready for review September 17, 2022 06:21

chenyukang commented Sep 17, 2022

View reviewed changes

compiler/rustc_resolve/src/late/diagnostics.rs Outdated Show resolved Hide resolved

chenyukang force-pushed the fix-101880 branch from 92e6500 to 14a7042 Compare September 19, 2022 07:27

chenyukang mentioned this pull request Sep 21, 2022

Code refactoring smart_resolve_report_errors #102085

Merged

chenyukang force-pushed the fix-101880 branch 4 times, most recently from 99a33b3 to 7d201c9 Compare September 29, 2022 15:29

chenyukang requested a review from estebank September 30, 2022 15:39

rust-highfive assigned estebank and unassigned oli-obk Oct 14, 2022

fix rust-lang#101880: suggest let for assignment, and some code refactor

eb68e27

estebank approved these changes Oct 21, 2022

View reviewed changes

chenyukang force-pushed the fix-101880 branch from 7d201c9 to d808fb0 Compare October 21, 2022 05:05

This comment has been minimized.

Sign in to view

chenyukang force-pushed the fix-101880 branch from d808fb0 to eb68e27 Compare October 21, 2022 07:03

chenyukang commented Oct 21, 2022

View reviewed changes

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 Oct 21, 2022

notriddle added a commit to notriddle/rust that referenced this pull request Oct 21, 2022

Rollup merge of rust-lang#101908 - chenyukang:fix-101880, r=estebank

b22480f

Suggest let for assignment, and some code refactor Fixes rust-lang#101880

notriddle mentioned this pull request Oct 21, 2022

Rollup of 11 pull requests #103374

Closed

Dylan-DPC mentioned this pull request Oct 23, 2022

Rollup of 6 pull requests #103431

Merged

bors merged commit 518d5eb into rust-lang:master Oct 23, 2022

rustbot added this to the 1.66.0 milestone Oct 23, 2022

chenyukang mentioned this pull request Oct 24, 2022

Compiler hang with incomplete struct literal at end of file #103451

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Suggest let for assignment, and some code refactor #101908

Suggest let for assignment, and some code refactor #101908

chenyukang commented Sep 16, 2022

rust-highfive commented Sep 16, 2022

This comment has been minimized.

chenyukang commented Sep 17, 2022 •

edited

Loading

estebank commented Sep 19, 2022

bors commented Sep 29, 2022

chenyukang commented Oct 14, 2022

bors commented Oct 20, 2022

estebank left a comment

estebank Oct 21, 2022

estebank Oct 21, 2022

estebank Oct 21, 2022

chenyukang Oct 21, 2022

This comment has been minimized.

chenyukang Oct 21, 2022

chenyukang commented Oct 21, 2022

estebank commented Oct 21, 2022

bors commented Oct 21, 2022

Kaligule commented Oct 28, 2022

		let has_eq = matches!(sm.span_to_snippet(eq_span), Ok(ref snippet) if snippet == "=");
		if has_eq {

	let has_eq = matches!(sm.span_to_snippet(eq_span), Ok(ref snippet) if snippet == "=");
	if has_eq {
	if let Ok(ref snippet) = sm.span_to_snippet(eq_span) && snippet == "=" {

Suggest let for assignment, and some code refactor #101908

Suggest let for assignment, and some code refactor #101908

Conversation

chenyukang commented Sep 16, 2022

rust-highfive commented Sep 16, 2022

This comment has been minimized.

chenyukang commented Sep 17, 2022 • edited Loading

estebank commented Sep 19, 2022

bors commented Sep 29, 2022

chenyukang commented Oct 14, 2022

bors commented Oct 20, 2022

estebank left a comment

Choose a reason for hiding this comment

estebank Oct 21, 2022

Choose a reason for hiding this comment

estebank Oct 21, 2022

Choose a reason for hiding this comment

estebank Oct 21, 2022

Choose a reason for hiding this comment

chenyukang Oct 21, 2022

Choose a reason for hiding this comment

This comment has been minimized.

chenyukang Oct 21, 2022

Choose a reason for hiding this comment

chenyukang commented Oct 21, 2022

estebank commented Oct 21, 2022

bors commented Oct 21, 2022

Kaligule commented Oct 28, 2022

chenyukang commented Sep 17, 2022 •

edited

Loading