fix incorrect suggestions in private import diagnostic

[el-ev]

View all comments

Resolves #156060.

1. In nested imports like use two::{One, ...}, the diagnostic suggested replacing the One with a multi-segment path of a different module, producing invalid code like use crate::two::{one::One, Two}. Skip it when single_nested == true.
2. Stop unconditionally skipping the first segment of import.module_path, which can produce incorrect paths in edition 2018 and later.
3. Mark the suggestion as "directly" instead of "through the re-export" when the import's source is the definition itself.

[rustbot]

r? @jdonszelmann

rustbot has assigned @jdonszelmann.
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

Why was this reviewer chosen?

The reviewer was selected based on:

• Owners of files modified in this PR: compiler
• compiler expanded to 73 candidates
• Random selection from 19 candidates

[mu001999]

By the way, the following will also emit an invalid suggestion (invalid after edition 2015), because we skipped the first segment:

mod one {
    pub struct One;
}

mod two {
    use crate::one::One;
}

mod test {
    use crate::two::One;
}

View changes since this review

[el-ev]

I'll take a look later this day

[mu001999]

r? me

[mu001999]

Thanks!

@bors r+ rollup

View changes since this review

[rust-bors]

📌 Commit 6d5fc32 has been approved by mu001999

It is now in the queue for this repository.