Skip to content

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Jun 20, 2023

Fixes #112674

An easy fix, r? @Nilstrieb

@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 20, 2023
Copy link
Member

@Noratrieb Noratrieb left a comment

Choose a reason for hiding this comment

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

could you add one more test for

pub use b::{x,y};
//~^ ERROR unresolved imports `b::x`, `b::y`
//~| NOTE no `x` in `b`
//~| NOTE no `y` in `b`

mod b {
    #[cfg(no)]
    pub fn x() {}
    //~^ NOTE found an item that was configured out
    #[cfg(no)]
    pub fn y() {}
    //~^ NOTE found an item that was configured out
}

r=me aftwerwards

@Noratrieb
Copy link
Member

@bors delegate+

@bors
Copy link
Collaborator

bors commented Jun 24, 2023

✌️ @bvanjoi, you can now approve this pull request!

If @Nilstrieb told you to "r=me" after making some further change, please make that change, then do @bors r=@Nilstrieb

@Noratrieb
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 24, 2023

📌 Commit 8c8c7ef has been approved by Nilstrieb

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 Jun 24, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2023
…llaumeGomez

Rollup of 8 pull requests

Successful merges:

 - rust-lang#112703 ([-Ztrait-solver=next, mir-typeck] instantiate hidden types in the root universe)
 - rust-lang#112854 (fix: add cfg diagnostic for unresolved import error)
 - rust-lang#112912 (style-guide: Rewrite let-else section for clarity, without changing formatting)
 - rust-lang#112915 (Update runtests.py : grammar correction)
 - rust-lang#112971 (issue template: add clippy entry which points to the clippy repo)
 - rust-lang#112989 (Add a regression test for rust-lang#109141)
 - rust-lang#113002 (bootstrap: Backup `settings.json` to the correct filename)
 - rust-lang#113003 (Fix old python deprecation check in x.py)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a1f2f23 into rust-lang:master Jun 24, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 24, 2023
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.

cfg diagnostic not applied on imports
5 participants