Skip to content

Commit 05f77ac

Browse files
Rollup merge of #47633 - pietroalbini:fix-ice-use-self, r=nagisa
Fix ICE with `use self;` Closes #47623
2 parents 6e6ab1e + e9d0141 commit 05f77ac

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

src/librustc/hir/lowering.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2046,7 +2046,8 @@ impl<'a> LoweringContext<'a> {
20462046
};
20472047

20482048
// Correctly resolve `self` imports
2049-
if path.segments.last().unwrap().identifier.name == keywords::SelfValue.name() {
2049+
if path.segments.len() > 1 &&
2050+
path.segments.last().unwrap().identifier.name == keywords::SelfValue.name() {
20502051
let _ = path.segments.pop();
20512052
if ident.name == keywords::SelfValue.name() {
20522053
*name = path.segments.last().unwrap().identifier.name;

src/test/ui/issue-47623.rs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2018 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+
use self; //~ERROR `self` imports are only allowed within a { } list
12+
13+
fn main() {}

src/test/ui/issue-47623.stderr

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
error[E0429]: `self` imports are only allowed within a { } list
2+
--> $DIR/issue-47623.rs:11:5
3+
|
4+
11 | use self; //~ERROR `self` imports are only allowed within a { } list
5+
| ^^^^
6+
7+
error: aborting due to previous error
8+

0 commit comments

Comments
 (0)