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.

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

Fix redundant import errors for preload extern crate #121958

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Fix redundant import errors for preload extern crate #121958

merged 1 commit into from
Mar 7, 2024

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Mar 4, 2024 •
edited
Loading

Fixes #121915

@rustbot
Copy link
Collaborator

rustbot commented Mar 4, 2024

r? @pnkfelix

rustbot has assigned @pnkfelix.
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 Mar 4, 2024
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch from 6985c4b to 25e56de Compare March 4, 2024 02:38
@petrochenkov petrochenkov self-assigned this Mar 4, 2024
@pnkfelix
Copy link
Member

pnkfelix commented Mar 4, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Mar 4, 2024

📌 Commit 25e56de has been approved by pnkfelix

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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 4, 2024
@pnkfelix
Copy link
Member

pnkfelix commented Mar 4, 2024

@bors rollup

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 4, 2024
@GuillaumeGomez
Rollup merge of rust-lang#121958 - chenyukang:yukang-fix-121915-impor…
85f3738 
…t, r=pnkfelix

Fix redundant import errors for preload extern crate

Fixes rust-lang#121915
@GuillaumeGomez GuillaumeGomez mentioned this pull request Mar 4, 2024
Closed
petrochenkov
petrochenkov reviewed Mar 4, 2024
View reviewed changes
compiler/rustc_lint/src/context/diagnostics.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_lint/src/context/diagnostics.rs Outdated Show resolved Hide resolved
tests/ui/imports/redundant-import-issue-121915.rs Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

r? @petrochenkov
@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 4, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2024
@bors
Auto merge of rust-lang#121982 - GuillaumeGomez:rollup-kh0w7jd, r=Gui…
fe89a68 
…llaumeGomez

Rollup of 9 pull requests

Successful merges:

 - rust-lang#120976 (constify a couple thread_local statics)
 - rust-lang#121576 (Convert the rest of the visitors to use `VisitorResult`)
 - rust-lang#121826 (Use root obligation on E0277 for some cases)
 - rust-lang#121928 (Extract an arguments struct for `Builder::then_else_break`)
 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121959 (Removing absolute path in proc-macro)
 - rust-lang#121968 (Don't run test_get_os_named_thread on win7)
 - rust-lang#121977 (Doc: Fix incorrect reference to integer in Atomic{Ptr,Bool}::as_ptr.)
 - rust-lang#121978 (Fix duplicated path in the "not found dylib" error)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease
Copy link
Member

fmease commented Mar 4, 2024 •
edited
Loading

I've closed the rollup PR, #121982, which included this PR. petrochenkov, in the future could you please immediately r- any corresponding rollup PRs to prevent us merging outdated/r-'ed commits. Thanks!

@bors

This comment was marked as resolved.

Sign in to view
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch 2 times, most recently from 23f52db to f6aa902 Compare March 5, 2024 13:59
@chenyukang
Copy link
Member Author

@petrochenkov @surechen
I updated the code and tests.

petrochenkov
petrochenkov reviewed Mar 5, 2024
View reviewed changes
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch 2 times, most recently from 74ed601 to 4e5c823 Compare March 6, 2024 03:47
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch from 4e5c823 to a2c624b Compare March 6, 2024 04:12
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch from a2c624b to ac035e7 Compare March 6, 2024 04:18
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

I suggest landing all the changes except removal spans in a separate PR.

@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch 4 times, most recently from 741df34 to ea4a7bf Compare March 6, 2024 13:23
@chenyukang
Copy link
Member Author

I suggest landing all the changes except removal spans in a separate PR.

Rollbacked to only fix #121915 now, will send another PR for #121315.

@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch from ea4a7bf to b0618b8 Compare March 6, 2024 13:27
@chenyukang chenyukang force-pushed the yukang-fix-121915-import branch from b0618b8 to 5a4ff27 Compare March 6, 2024 13:29
@petrochenkov
Copy link
Contributor

I see you kept the added tests, that's great.
@bors r+

@bors
Copy link
Contributor

bors commented Mar 6, 2024

📌 Commit 5a4ff27 has been approved by petrochenkov

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 Mar 6, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 6, 2024
@matthiaskrgr
Rollup merge of rust-lang#121958 - chenyukang:yukang-fix-121915-impor…
8f99d57 
…t, r=petrochenkov

Fix redundant import errors for preload extern crate

Fixes rust-lang#121915
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 6, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@bors
Auto merge of rust-lang#122096 - matthiaskrgr:rollup-s8sh1rn, r=matth…
4268d71 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@bors
Auto merge of rust-lang#122096 - matthiaskrgr:rollup-s8sh1rn, r=matth…
ed4cff2 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122066 (Add proper cfgs for struct HirIdValidator used only with debug-assert)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 6, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@bors
Auto merge of rust-lang#122113 - matthiaskrgr:rollup-5d1jnwi, r=matth…
db4f116 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2024
@bors
Auto merge of rust-lang#122113 - matthiaskrgr:rollup-5d1jnwi, r=matth…
aa029ce 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#121958 (Fix redundant import errors for preload extern crate)
 - rust-lang#121976 (Add an option to have an external download/bootstrap cache)
 - rust-lang#122022 (loongarch: add frecipe and relax target feature)
 - rust-lang#122026 (Do not try to format removed files)
 - rust-lang#122027 (Uplift some feeding out of `associated_type_for_impl_trait_in_impl` and into queries)
 - rust-lang#122063 (Make the lowering of `thir::ExprKind::If` easier to follow)
 - rust-lang#122074 (Add missing PartialOrd trait implementation doc for array)
 - rust-lang#122082 (remove outdated fixme comment)
 - rust-lang#122091 (Note why we're using a new thread in `test_get_os_named_thread`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 550b8a2 into rust-lang:master Mar 7, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Mar 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2024
@rust-timer
Unrolled build for rust-lang#121958
f258d0a 
Rollup merge of rust-lang#121958 - chenyukang:yukang-fix-121915-import, r=petrochenkov

Fix redundant import errors for preload extern crate

Fixes rust-lang#121915
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@surechen surechen surechen left review comments

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

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
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.

unused_imports redundant import is already defined here points to self
8 participants
@chenyukang @rustbot @pnkfelix @bors @petrochenkov @fmease @rust-log-analyzer @surechen