Skip to content

Commit bc24819

Browse files
luqmanaalexcrichton
authored andcommitted
librustc: Don't ICE with struct exprs where the name is not a valid struct.
1 parent bd15854 commit bc24819

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

src/librustc/middle/typeck/check/mod.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3547,6 +3547,17 @@ fn check_expr_with_unifier(fcx: &FnCtxt,
35473547
span_err!(tcx.sess, path.span, E0071,
35483548
"`{}` does not name a structure",
35493549
pprust::path_to_string(path));
3550+
3551+
// Make sure to still write the types
3552+
// otherwise we might ICE
3553+
fcx.write_error(id);
3554+
for field in fields.iter() {
3555+
check_expr(fcx, &*field.expr);
3556+
}
3557+
match base_expr {
3558+
Some(ref base) => check_expr(fcx, &**base),
3559+
None => {}
3560+
}
35503561
}
35513562
}
35523563

src/test/compile-fail/issue-16058.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
12+
pub struct GslResult {
13+
pub val: f64,
14+
pub err: f64
15+
}
16+
17+
impl GslResult {
18+
pub fn new() -> GslResult {
19+
Result { //~ ERROR: `Result` does not name a structure
20+
val: 0f64,
21+
err: 0f64
22+
}
23+
}
24+
}
25+
26+
fn main() {}

0 commit comments

Comments
 (0)