Skip to content

Commit

Permalink
Handle fieldless tuple structs in diagnostic code
Browse files Browse the repository at this point in the history
Fixes #75062
  • Loading branch information
Aaron1011 committed Aug 5, 2020
1 parent 1d69e3b commit 48bc398
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/librustc_resolve/diagnostics.rs
Expand Up @@ -1075,10 +1075,9 @@ impl<'a> Resolver<'a> {
) = binding.kind
{
let def_id = (&*self).parent(ctor_def_id).expect("no parent for a constructor");
if let Some(fields) = self.field_names.get(&def_id) {
let first_field = fields.first().expect("empty field list in the map");
return Some(fields.iter().fold(first_field.span, |acc, field| acc.to(field.span)));
}
let fields = self.field_names.get(&def_id)?;
let first_field = fields.first()?; // Handle `struct Foo()`
return Some(fields.iter().fold(first_field.span, |acc, field| acc.to(field.span)));
}
None
}
Expand Down
10 changes: 10 additions & 0 deletions src/test/ui/privacy/issue-75062-fieldless-tuple-struct.rs
@@ -0,0 +1,10 @@
// Regression test for issue #75062
// Tests that we don't ICE on a privacy error for a fieldless tuple struct.

mod foo {
struct Bar();
}

fn main() {
foo::Bar(); //~ ERROR tuple struct
}
15 changes: 15 additions & 0 deletions src/test/ui/privacy/issue-75062-fieldless-tuple-struct.stderr
@@ -0,0 +1,15 @@
error[E0603]: tuple struct `Bar` is private
--> $DIR/issue-75062-fieldless-tuple-struct.rs:9:10
|
LL | foo::Bar();
| ^^^ private tuple struct
|
note: the tuple struct `Bar` is defined here
--> $DIR/issue-75062-fieldless-tuple-struct.rs:5:5
|
LL | struct Bar();
| ^^^^^^^^^^^^^

error: aborting due to previous error

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

0 comments on commit 48bc398

Please sign in to comment.