New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an option to use "::" for the external crate prefix. #17523

Merged

bors merged 1 commit into rust-lang:master from wada314:master

Jul 7, 2024

Contributor

wada314 commented Jul 1, 2024 •

edited

Loading

Fixes #11823 .
Hi I'm very new to rust-analyzer and not sure how the review process are. Can somebody take a look at this PR? thanks!

rustbot added the S-waiting-on-review label

wada314 changed the title ~~passed!~~ Add an option to use "::" for the external crate prefix.

wada314 marked this pull request as ready for review

July 1, 2024 11:16

This comment was marked as off-topic.

Sign in to view

rustbot added has-merge-commits S-waiting-on-author labels

This comment was marked as off-topic.

Sign in to view

wada314 force-pushed the master branch from be9cb98 to c1fff1e Compare

July 1, 2024 11:52

rustbot removed has-merge-commits S-waiting-on-author labels

Veykril reviewed

View reviewed changes

crates/rust-analyzer/src/config.rs Outdated

@@ @@ -359,6 +359,8 @@ config_data! { @@
                       imports_preferPrelude: bool                       = false,
                       /// The path structure for newly inserted paths to use.
                       imports_prefix: ImportPrefixDef               = ImportPrefixDef::Plain,
+                      /// Whether to prefix external (including std, core) crate imports with `::`. e.g. "use ::std::io::Read;".
+                      imports_prefix_external_crate: bool = false,

Member

Veykril Jul 1, 2024 •

edited

Loading

This name collides with the above (one being the prefix object, the other being a field in said object, we should probably sanity check that those configs don't exist in a test) which will cause issues, imports_prefixExternPrelude would be better

Contributor Author

wada314 Jul 1, 2024

Thanks for taking a look at my PR! Renamed it.

rustbot added has-merge-commits S-waiting-on-author labels

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits:

d01d545

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

wada314 force-pushed the master branch from 560219f to fe82d24 Compare

July 1, 2024 16:25

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

fe82d24

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

f151de8

wada314 force-pushed the master branch from f151de8 to b488610 Compare

July 1, 2024 16:36

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

b488610

Collaborator

rustbot commented Jul 1, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust-analyzer.git master
$ git push --force-with-lease

The following commits are merge commits (since this message was last posted):

d1a71f1


          squash.

3725ab3

wada314 force-pushed the master branch from d1a71f1 to 3725ab3 Compare

July 1, 2024 16:52

rustbot removed has-merge-commits S-waiting-on-author labels

Veykril approved these changes

View reviewed changes

Member

Veykril commented Jul 7, 2024

Thanks!
@bors r+

Contributor

bors commented Jul 7, 2024

📌 Commit 3725ab3 has been approved by Veykril

It is now in the queue for this repository.

Contributor

bors commented Jul 7, 2024

⌛ Testing commit 3725ab3 with merge a494aab...

Contributor

bors commented Jul 7, 2024

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing a494aab to master...

bors merged commit a494aab into rust-lang:master

11 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-review