Skip to content

Commit

Permalink
Rollup merge of rust-lang#47633 - pietroalbini:fix-ice-use-self, r=na…
Browse files Browse the repository at this point in the history
…gisa

Fix ICE with `use self;`

Closes rust-lang#47623
  • Loading branch information
GuillaumeGomez authored Jan 21, 2018
2 parents 6e6ab1e + e9d0141 commit 05f77ac
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc/hir/lowering.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2046,7 +2046,8 @@ impl<'a> LoweringContext<'a> {
};

// 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;
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/issue-47623.rs
Original file line number Diff line number Diff line change
@@ -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() {}
8 changes: 8 additions & 0 deletions src/test/ui/issue-47623.stderr
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 05f77ac

Please sign in to comment.