Skip to content
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.

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

Tweak output of import suggestions #126371

Closed
wants to merge 1 commit into from

Conversation

estebank
Copy link
Contributor

When both std:: and core:: items are available, only suggest the std:: ones. We ensure that in no_std crates we suggest core:: items.

Ensure that the list of items suggested to be imported are always in the order of local crate items, std/core items and finally foreign crate items.

Tweak wording of import suggestion: if there are multiple items but they are all of the same kind, we use the kind name and not the generic "items".

Fix #83564.

@rustbot
Copy link
Collaborator

rustbot commented Jun 13, 2024

r? @fmease

rustbot has assigned @fmease.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added 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 Jun 13, 2024
@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@fmease fmease left a comment

Choose a reason for hiding this comment

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

Thanks for splitting this out of the other PR :D
r=me once tests fixed (extraneous trailing line break in the rustfixed file or sth. like that)

@@ -2,9 +2,19 @@
//
// This is a regression test for #83564.
// For some reason, Rust 2018 or higher is required to reproduce the bug.
Copy link
Member

Choose a reason for hiding this comment

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

Huh, odd. Might be worth investigating some time.

@fmease fmease 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 Jun 13, 2024
@rust-log-analyzer

This comment has been minimized.

@rustbot
Copy link
Collaborator

rustbot commented Jun 13, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@estebank
Copy link
Contributor Author

@bors r=fmease

@bors
Copy link
Contributor

bors commented Jun 13, 2024

📌 Commit 5de8e6e has been approved by fmease

It is now in the queue for this repository.

@bors 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 Jun 13, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 13, 2024
Tweak output of import suggestions

When both `std::` and `core::` items are available, only suggest the `std::` ones. We ensure that in `no_std` crates we suggest `core::` items.

Ensure that the list of items suggested to be imported are always in the order of local crate items, `std`/`core` items and finally foreign crate items.

Tweak wording of import suggestion: if there are multiple items but they are all of the same kind, we use the kind name and not the generic "items".

Fix rust-lang#83564.
@rust-log-analyzer

This comment has been minimized.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126238 (Fix Miri sysroot for `x run`)
 - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
 - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
 - rust-lang#126371 (Tweak output of import suggestions)
 - rust-lang#126388 (const-eval: make lint scope computation consistent)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)

r? `@ghost`
`@rustbot` modify labels: rollup
@estebank
Copy link
Contributor Author

I'm not sure what the rustdoc test error is. I cannot replicate by running ./x.py test tests/rustdoc-gui --bless

When both `std::` and `core::` items are available, only suggest the
`std::` ones. We ensure that in `no_std` crates we suggest `core::`
items.

Ensure that the list of items suggested to be imported are always in the
order of local crate items, `std`/`core` items and finally foreign crate
items.

Tweak wording of import suggestion: if there are multiple items but they
are all of the same kind, we use the kind name and not the generic "items".

Fix rust-lang#83564.
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
.......... (120/124)
...F       (124/124)


/checkout/tests/rustdoc-gui/help-page.goml help-page... FAILED
[ERROR] `tests/rustdoc-gui/utils.goml` line 16
    from `tests/rustdoc-gui/help-page.goml` line 23
    from `tests/rustdoc-gui/help-page.goml` line 32: Error: Evaluation failed: The following errors happened: [localStorage item "rustdoc-theme" (of value "ayu") != "null"]: for command `assert-local-storage: {"rustdoc-theme": |theme|}`
Error: ()
Build completed unsuccessfully in 0:03:30
  local time: Thu Jun 13 22:54:12 UTC 2024
  network time: Thu, 13 Jun 2024 22:54:12 GMT

@fmease
Copy link
Member

fmease commented Jun 14, 2024

That's not on you, the test has become super flaky half a day ago for some reason. CC #126430, #126436, #126445.

I think we just need to wait for #126445 to get merged and reopen the tree. Optionally we can rerun CI here, too, once that has happened.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126238 (Fix Miri sysroot for `x run`)
 - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
 - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
 - rust-lang#126371 (Tweak output of import suggestions)
 - rust-lang#126388 (const-eval: make lint scope computation consistent)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
Rollup merge of rust-lang#126371 - estebank:suggest-core, r=fmease

Tweak output of import suggestions

When both `std::` and `core::` items are available, only suggest the `std::` ones. We ensure that in `no_std` crates we suggest `core::` items.

Ensure that the list of items suggested to be imported are always in the order of local crate items, `std`/`core` items and finally foreign crate items.

Tweak wording of import suggestion: if there are multiple items but they are all of the same kind, we use the kind name and not the generic "items".

Fix rust-lang#83564.
@fmease
Copy link
Member

fmease commented Jun 14, 2024

5de8e6e has been merged via rollup. Now this PR isn't marked as merged because 0a65bdd (empty diff compared to earlier commit, so just commit message rename?) was force-pushed without subsequent bors-reapproval. I guess the only option left is to close this PR.

@fmease fmease closed this Jun 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustc suggests both std and core imports at times
5 participants