]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16598 : bkoropoff/rust/import-shadow-name, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 30 Aug 2014 12:41:22 +0000 (12:41 +0000)
committerbors <bors@rust-lang.org>
Sat, 30 Aug 2014 12:41:22 +0000 (12:41 +0000)
This partially alleviates the confusing behavior in issue #16597

1  2 
src/librustc/middle/resolve.rs

Simple merge