Suggest importing macros from the crate root by davidtwco · Pull Request #59784 · rust-lang/rust

davidtwco · 2019-04-07T22:14:53Z

This commit adds a test demonstrating the current behaviour when a macro defined in a module with the `#[macro_export]` is imported from the module rather than the crate root.

estebank

It seems ok to me, but there's quite a bit of span wrangling here that makes me uneasy (but is sometimes unavoidable). I'll take a closer look at that code later. For now the only complaint I'd have is the separation of the note into 3. Relying on terminal word-wrapping is reasonable in my mind.

davidtwco · 2019-04-10T20:47:11Z

It seems ok to me, but there's quite a bit of span wrangling here that makes me uneasy (but is sometimes unavoidable).

I only span-wrangled here because I couldn't see another way in this case. If you can think of an alternative, I'll happily take that approach. While I have introduced some more span-wrangling with this PR, I was able to re-use a bunch of the existing span-wrangling from a previous PR, some of the diff is just extracting that existing logic into functions.

This commit suggests importing a macro from the root of a crate as the intent may have been to import a macro from the definition location that was annotated with `#[macro_export]`.

This commit extends the suggestion to handle imports that are aliased to another name.

This commit introduces more dirty span manipulation into the compiler in order to handle the various edge cases in moving/renaming the macro import so it is at the root of the import.

This commit removes the assumption that the start of a use statement will always be on one line with a single space - which was silly in the first place.

This commit changes the suggestion so that it is split into multiple parts in an effort to reduce the impact the applied suggestion could have on formatting.

estebank · 2019-04-12T01:38:24Z

r=me once travis finishes

estebank · 2019-04-12T01:45:39Z

@bors r+

bors · 2019-04-12T01:45:41Z

📌 Commit 5158063 has been approved by estebank

@estebank

Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

@ghost

Rollup of 9 pull requests Successful merges: - rust-lang#59655 (Use a proc macro to declare preallocated symbols) - rust-lang#59769 (compiletest normalization: preserve non-JSON lines such as ICEs) - rust-lang#59776 (Apply resource-suffix to search-index and source-files scripts as well) - rust-lang#59784 (Suggest importing macros from the crate root) - rust-lang#59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - rust-lang#59856 (update polonius-engine) - rust-lang#59874 (Clean up handling of `-Z pgo-gen` commandline option.) - rust-lang#59890 (Don't generate empty json variables) - rust-lang#59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost

@estebank

Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

@estebank

Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

@ghost

Rollup of 6 pull requests Successful merges: - #59776 (Apply resource-suffix to search-index and source-files scripts as well) - #59784 (Suggest importing macros from the crate root) - #59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - #59874 (Clean up handling of `-Z pgo-gen` commandline option.) - #59890 (Don't generate empty json variables) - #59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost

Add test with current behaviour.
126ac9e
This commit adds a test demonstrating the current behaviour when a macro defined in a module with the `#[macro_export]` is imported from the module rather than the crate root.

rust-highfive assigned estebank Apr 7, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 7, 2019

davidtwco commented Apr 7, 2019
View reviewed changes

Comment threadsrc/librustc_resolve/error_reporting.rs Outdated

petrochenkov assigned petrochenkov and unassigned petrochenkov Apr 7, 2019

estebank reviewed Apr 10, 2019
View reviewed changes

Comment threadsrc/librustc_resolve/error_reporting.rs Outdated

davidtwco force-pushed the issue-59764 branch from 22aabf6 to ad4412fCompare April 10, 2019 20:43

estebank reviewed Apr 10, 2019
View reviewed changes

Comment threadsrc/librustc_resolve/error_reporting.rs Outdated
Comment threadsrc/librustc_resolve/error_reporting.rs Outdated
Comment threadsrc/librustc_resolve/error_reporting.rs Outdated
Comment threadsrc/librustc_resolve/error_reporting.rs Outdated

davidtwco added 5 commits April 12, 2019 01:54

Suggest macro import from crate root.
d84907b
This commit suggests importing a macro from the root of a crate as the intent may have been to import a macro from the definition location that was annotated with `#[macro_export]`.

Handle renamed imports.
d589cf9
This commit extends the suggestion to handle imports that are aliased to another name.

Handle edge cases.
7c95540
This commit introduces more dirty span manipulation into the compiler in order to handle the various edge cases in moving/renaming the macro import so it is at the root of the import.

Improve robustness of nested check.
137ffa1
This commit removes the assumption that the start of a use statement will always be on one line with a single space - which was silly in the first place.

Switch to multipart suggestions.
5158063
This commit changes the suggestion so that it is split into multiple parts in an effort to reduce the impact the applied suggestion could have on formatting.

davidtwco force-pushed the issue-59764 branch from ad4412f to 5158063Compare April 11, 2019 23:54

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 Apr 12, 2019

Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
Rollup merge ofrust-lang#59784- davidtwco:issue-59764, r=estebank
dbaf5fc
Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

Centril mentioned this pull request Apr 13, 2019
Rollup of 9 pull requests #59938
Closed

Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
Rollup merge ofrust-lang#59784- davidtwco:issue-59764, r=estebank
ae90d8d
Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

Centril mentioned this pull request Apr 13, 2019
Rollup of 8 pull requests #59942
Closed

Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
Rollup merge ofrust-lang#59784- davidtwco:issue-59764, r=estebank
c4a3332
Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

Centril mentioned this pull request Apr 13, 2019
Rollup of 6 pull requests #59950
Merged

bors merged commit 5158063 into rust-lang:masterApr 14, 2019

davidtwco deleted the issue-59764 branch April 14, 2019 13:49

Navigation Menu

Uh oh!

Uh oh!

Suggest importing macros from the crate root - #59784

Suggest importing macros from the crate root#59784
bors merged 6 commits into
rust-lang:masterfrom
davidtwco:issue-59764

davidtwco commented Apr 7, 2019

Uh oh!

Uh oh!

estebank left a comment

Uh oh!

Uh oh!

davidtwco commented Apr 10, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

estebank commented Apr 12, 2019

Uh oh!

estebank commented Apr 12, 2019

Uh oh!

bors commented Apr 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Uh oh!

Conversation

davidtwco commented Apr 7, 2019

Uh oh!

Uh oh!

estebank left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

davidtwco commented Apr 10, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

estebank commented Apr 12, 2019

Uh oh!

estebank commented Apr 12, 2019

Uh oh!

bors commented Apr 12, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants