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

Fix #74081 and add the test case from #74236 #74240

Merged
merged 2 commits into from
Jul 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_middle/ty/print/pretty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ pub trait PrettyPrinter<'tcx>:
.tcx()
.item_children(visible_parent)
.iter()
.find(|child| child.res.def_id() == def_id)
.find(|child| child.res.opt_def_id() == Some(def_id))
.map(|child| child.ident.name);
if let Some(reexport) = reexport {
*name = reexport;
Expand Down
8 changes: 8 additions & 0 deletions src/test/ui/issues/issue-74236/auxiliary/dep.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// edition:2018

mod private { pub struct Pub; }

// Reexport built-in attribute without a DefId (requires Rust 2018).
pub use cfg_attr as attr;
// This export needs to be after the built-in attribute to trigger the bug.
pub use private::Pub as Renamed;
9 changes: 9 additions & 0 deletions src/test/ui/issues/issue-74236/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// edition:2018
// aux-build:dep.rs
// compile-flags:--extern dep

fn main() {
// Trigger an error that will print the path of dep::private::Pub (as "dep::Renamed").
let () = dep::Renamed;
//~^ ERROR mismatched types
}
11 changes: 11 additions & 0 deletions src/test/ui/issues/issue-74236/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0308]: mismatched types
--> $DIR/main.rs:7:9
|
LL | let () = dep::Renamed;
| ^^ ------------ this expression has type `dep::Renamed`
| |
| expected struct `dep::Renamed`, found `()`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0308`.