Incorrect reference resolution when crate contains a module with the same name as function being imported

In the below example, the polygon function and the rectangle function are resolved incorrectly as the polygon.rs module and the rectangle.rs module respectively.

Cargo.toml:

[package]
name = "rust_test"
version = "0.1.0"
authors = ["johnthagen <[e-mail]>"]

[dependencies]
piston_window = "0.52.0"

main.rs:

extern crate piston_window;

use piston_window::{
    clear,  // Correctly resolved as function.
    PistonWindow,
    polygon, // INCORRECTLY resolved as module polygon.rs (should be function polygon)
    rectangle, // INCORRECTLY resolved as module rectangle.rs (should be function rectangle)
    WindowSettings
};

const POLYGON: &'static [[f64; 2]] = &[
    [0.0, -1.0 * 16.0 / 2.0],
    [20.0, 0.0],
    [0.0, 16.0 / 2.0]
];

fn main() {
    let title = "Hello Piston! (press any key to enter inner loop)";
    let mut window: PistonWindow = WindowSettings::new(title, [640, 480])
        .exit_on_esc(true)
        .build()
        .unwrap_or_else(|error| { panic!("Failed to build PistonWindow: {}", error) });

    while let Some(event) = window.next() {
        const WHITE: [f32; 4] = [1.0, 1.0, 1.0, 1.0];
        const DARK_GREEN: [f32; 4] = [0.0, 0.5, 0.0, 1.0];

        window.draw_2d(&event,
                       |context, graphics| {
                           clear(WHITE, graphics);
                           rectangle(DARK_GREEN,
                                     [50.0, 50.0, 100.0, 100.0],
                                     context.transform,
                                     graphics);
                           polygon(DARK_GREEN,
                                   POLYGON,
                                   context.transform,
                                   graphics);
                       });
    }
}

Tested in PyCharm 2016.2.3, Windows 10 x64, plugin v0.1.0.981.

[matklad]

Simplified example:

mod m {
    pub mod foo { pub fn bar() {} }
    pub fn foo() {}
}

fn main() {
    use self::m::foo; // <- this should resolve to both a fn and a mod.

    foo(); // <- this should resolve to fn
    foo::bar(); // <- this should resolve to mod. 
}

[matklad]

Should be fixed now!