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

RES: Fix that cfg-enabled glob import overrides cfg-disabled named import #6889

Merged
merged 2 commits into from Feb 25, 2021

Conversation

dima74
Copy link
Member

@dima74 dima74 commented Feb 24, 2021

Fix cases like:

#[cfg(not(intellij_rust))]
mod mod1 {
    pub fn func() {}
}
mod mod2 {
    pub fn func() {}
}        //X

#[cfg(not(intellij_rust))]
use mod1::func;
use mod2::*;

fn main() {
    func();
} //^

changelog: Fix that cfg-enabled glob import should override cfg-disabled named import when using new name resolution engine

@dima74 dima74 added the fix Pull requests that fix some bug(s) label Feb 24, 2021
@dima74 dima74 added this to In Progress in To test via automation Feb 24, 2021
@dima74 dima74 force-pushed the diralik/resolve2-fix-import-override branch from 8c1eba8 to aebf051 Compare February 24, 2021 18:01
@vlad20012
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Feb 25, 2021

Build succeeded:

@bors bors bot merged commit 89bae1c into master Feb 25, 2021
To test automation moved this from In Progress to Test Feb 25, 2021
@bors bors bot deleted the diralik/resolve2-fix-import-override branch February 25, 2021 13:12
@github-actions github-actions bot added this to the v143 milestone Feb 25, 2021
@lancelote lancelote moved this from Test to Done in To test Apr 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix Pull requests that fix some bug(s)
Projects
To test
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants