Rollup merge of #47633 - pietroalbini:fix-ice-use-self, r=nagisa

Fix ICE with `use self;`

Closes #47623
This commit is contained in:
Guillaume Gomez 2018-01-21 23:11:44 +01:00 committed by GitHub
commit 05f77ac5c2
3 changed files with 23 additions and 1 deletions

View File

@ -2046,7 +2046,8 @@ fn lower_use_tree(&mut self,
};
// Correctly resolve `self` imports
if path.segments.last().unwrap().identifier.name == keywords::SelfValue.name() {
if path.segments.len() > 1 &&
path.segments.last().unwrap().identifier.name == keywords::SelfValue.name() {
let _ = path.segments.pop();
if ident.name == keywords::SelfValue.name() {
*name = path.segments.last().unwrap().identifier.name;

View File

@ -0,0 +1,13 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use self; //~ERROR `self` imports are only allowed within a { } list
fn main() {}

View File

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