Add diagnostic for calling a function with the same name with unresolved Macro #103140

chenyukang · 2022-10-17T08:20:49Z

rust-highfive · 2022-10-17T08:20:53Z

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

compiler-errors · 2022-10-17T17:56:30Z

compiler/rustc_resolve/src/macros.rs

                    let (span, label) = if let PathResult::Failed { span, label, .. } = path_res {
+                        // try to suggest if it's not a macro, maybe a function
+                        if let PathResult::NonModule(partial_res) =  self.resolve_path(


I think you can use maybe_resolve_path to simplify -- don't need to pass a Finalize, for example.

compiler-errors · 2022-10-17T17:57:34Z

compiler/rustc_resolve/src/macros.rs

+                            None,
+                        ) && partial_res.unresolved_segments() == 0 {
+                            let sm = self.session.source_map();
+                            let span = sm.span_extend_while(span, |c| c == '!').unwrap_or(span);


Can you make the suggestion just remove the !, and not replace macro! with macro? I think you can use something like SourceMap::next_point

I have a question for the next_point:

For the debug code:

let exclamation_span = sm.next_point(span); debug!("debug-now span: {:?}", span); debug!("debug-now exclamation_span: {:?}", exclamation_span); debug!("debug-now exclamation_span source: {:?}", sm.span_to_snippet(exclamation_span)); debug!("debug-now exclamation_span next : {:?}", sm.next_point(exclamation_span));

Printed out this log:

DEBUG rustc_resolve::macros debug-now span: src/test/ui/suggestions/issue-103112.rs:2:19: 2:24 (#0) DEBUG rustc_resolve::macros debug-now exclamation_span: src/test/ui/suggestions/issue-103112.rs:2:24: 2:24 (#0) DEBUG rustc_resolve::macros debug-now exclamation_span source: Ok("") DEBUG rustc_resolve::macros debug-now exclamation_span next : src/test/ui/suggestions/issue-103112.rs:2:24: 2:25 (#0)

Why span (with lo and hi 2:19: 2:24) 's next_point is not (2:25 2:25), it's (2:24 2:24) instead? seems counterintuitive.

There is a bug at here?

rust/compiler/rustc_span/src/source_map.rs

Line 869 in 194140b

let end_of_next_point = BytePos(cmp::max(sp.lo().0 + 1, end_of_next_point));

- let end_of_next_point = BytePos(cmp::max(sp.lo().0 + 1, end_of_next_point)); + let end_of_next_point = BytePos(cmp::max(sp.hi().0 + 1, end_of_next_point));

Because of this bug, we always want to call two times of next_point，

For example:

rust/compiler/rustc_expand/src/expand.rs

Line 940 in 9b0a099

let semi_span = this.sess.source_map().next_point(span);

rust/compiler/rustc_resolve/src/late/diagnostics.rs

Line 1733 in 98a5ac2

sp = sm.next_point(sp);

@estebank how do you think?

Add another PR to fix it: #103185

@chenyukang thanks for fixing the bug with next_point!

chenyukang · 2022-10-18T11:36:43Z

Will merge after PR: #103185

…int, r=davidtwco Fix the bug of next_point in source_map There is a bug in `next_point`, the new span won't move to next position when be called in the first time. For this reason, our current code is working like this: 1. When we really want to move to the next position, we called two times of `next_point` 2. Some code which use `next_point` actually done the same thing with `shrink_to_hi` This fix make sure when `next_point` is called, span will move with the width at least 1, and also work correctly in the scenario of multiple bytes. Ref: rust-lang#103140 (comment) r? `@davidtwco`

estebank · 2022-10-19T22:24:29Z

r=me after #103185 lands and this is rebased

…same name when a Macro is not found

…t, r=davidtwco Fix the bug of next_point in source_map There is a bug in `next_point`, the new span won't move to next position when be called in the first time. For this reason, our current code is working like this: 1. When we really want to move to the next position, we called two times of `next_point` 2. Some code which use `next_point` actually done the same thing with `shrink_to_hi` This fix make sure when `next_point` is called, span will move with the width at least 1, and also work correctly in the scenario of multiple bytes. Ref: rust-lang#103140 (comment) r? `@davidtwco`

chenyukang · 2022-10-20T14:18:58Z

r? @estebank

…dtwco Fix the bug of next_point in source_map There is a bug in `next_point`, the new span won't move to next position when be called in the first time. For this reason, our current code is working like this: 1. When we really want to move to the next position, we called two times of `next_point` 2. Some code which use `next_point` actually done the same thing with `shrink_to_hi` This fix make sure when `next_point` is called, span will move with the width at least 1, and also work correctly in the scenario of multiple bytes. Ref: rust-lang/rust#103140 (comment) r? `@davidtwco`

estebank · 2022-10-22T02:35:23Z

@bors r+

bors · 2022-10-22T02:35:25Z

📌 Commit f90bf50 has been approved by estebank

It is now in the queue for this repository.

…tebank Add diagnostic for calling a function with the same name with unresolved Macro Fixes rust-lang#103112

Rollup of 11 pull requests Successful merges: - rust-lang#100462 (Clarify `array::from_fn` documentation) - rust-lang#101644 (Document surprising and dangerous fs::Permissions behaviour on Unix) - rust-lang#103005 (kmc-solid: Handle errors returned by `SOLID_FS_ReadDir`) - rust-lang#103140 (Add diagnostic for calling a function with the same name with unresolved Macro) - rust-lang#103254 (rustdoc: do not filter out cross-crate `Self: Sized` bounds) - rust-lang#103347 (bootstrap: also create rustc-src component in sysroot) - rust-lang#103402 (Fix wrapped valid-range handling in ty_find_init_error) - rust-lang#103414 (Pretty print lifetimes captured by RPIT) - rust-lang#103424 (rustdoc: remove no-op CSS `.code-header { border-bottom: none }`) - rust-lang#103434 (Use functions for jump-to-def-background rustdoc GUI test) - rust-lang#103447 (`MaybeUninit`: use `assume_init_drop()` in the partially initialized array example) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…dtwco Fix the bug of next_point in source_map There is a bug in `next_point`, the new span won't move to next position when be called in the first time. For this reason, our current code is working like this: 1. When we really want to move to the next position, we called two times of `next_point` 2. Some code which use `next_point` actually done the same thing with `shrink_to_hi` This fix make sure when `next_point` is called, span will move with the width at least 1, and also work correctly in the scenario of multiple bytes. Ref: rust-lang/rust#103140 (comment) r? `@davidtwco`

rust-highfive assigned fee1-dead Oct 17, 2022

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

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

compiler-errors reviewed Oct 17, 2022

View reviewed changes

chenyukang mentioned this pull request Oct 18, 2022

Fix the bug of next_point in source_map #103185

Merged

This comment has been minimized.

Sign in to view

chenyukang added 2 commits October 20, 2022 11:55

fix rust-lang#103112, add diagnostic for calling a function with the …

1225c3f

…same name when a Macro is not found

fix span for suggestion

f90bf50

fee1-dead assigned estebank and unassigned fee1-dead Oct 20, 2022

fee1-dead added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 20, 2022

chenyukang force-pushed the yukang/fix-103112 branch from 72a4ee0 to f90bf50 Compare October 20, 2022 13:39

rustbot added the A-testsuite Area: The testsuite used to check the correctness of rustc label Oct 20, 2022

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 22, 2022

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Oct 23, 2022

Rollup merge of rust-lang#103140 - chenyukang:yukang/fix-103112, r=es…

6a3affb

…tebank Add diagnostic for calling a function with the same name with unresolved Macro Fixes rust-lang#103112

Dylan-DPC mentioned this pull request Oct 23, 2022

Rollup of 6 pull requests #103436

Closed

notriddle mentioned this pull request Oct 23, 2022

Rollup of 11 pull requests #103452

Merged

bors merged commit 3df030d into rust-lang:master Oct 24, 2022

rustbot added this to the 1.66.0 milestone Oct 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add diagnostic for calling a function with the same name with unresolved Macro #103140

Add diagnostic for calling a function with the same name with unresolved Macro #103140

chenyukang commented Oct 17, 2022

rust-highfive commented Oct 17, 2022

compiler-errors Oct 17, 2022

compiler-errors Oct 17, 2022

chenyukang Oct 18, 2022 •

edited

Loading

chenyukang Oct 18, 2022

chenyukang Oct 18, 2022 •

edited

Loading

chenyukang Oct 18, 2022

estebank Oct 19, 2022

chenyukang commented Oct 18, 2022 •

edited

Loading

This comment has been minimized.

estebank commented Oct 19, 2022

chenyukang commented Oct 20, 2022

estebank commented Oct 22, 2022

bors commented Oct 22, 2022

Add diagnostic for calling a function with the same name with unresolved Macro #103140

Add diagnostic for calling a function with the same name with unresolved Macro #103140

Conversation

chenyukang commented Oct 17, 2022

rust-highfive commented Oct 17, 2022

compiler-errors Oct 17, 2022

Choose a reason for hiding this comment

compiler-errors Oct 17, 2022

Choose a reason for hiding this comment

chenyukang Oct 18, 2022 • edited Loading

Choose a reason for hiding this comment

chenyukang Oct 18, 2022

Choose a reason for hiding this comment

chenyukang Oct 18, 2022 • edited Loading

Choose a reason for hiding this comment

chenyukang Oct 18, 2022

Choose a reason for hiding this comment

estebank Oct 19, 2022

Choose a reason for hiding this comment

chenyukang commented Oct 18, 2022 • edited Loading

This comment has been minimized.

estebank commented Oct 19, 2022

chenyukang commented Oct 20, 2022

estebank commented Oct 22, 2022

bors commented Oct 22, 2022

chenyukang Oct 18, 2022 •

edited

Loading

chenyukang Oct 18, 2022 •

edited

Loading

chenyukang commented Oct 18, 2022 •

edited

Loading