Skip to content

Commit

Permalink
remove FIXME(rust-lang#48116) and remove the logic to debug the issue
Browse files Browse the repository at this point in the history
  • Loading branch information
nivkner committed Mar 17, 2018
1 parent 2c6b7b9 commit 0d8fa82
Showing 1 changed file with 3 additions and 22 deletions.
25 changes: 3 additions & 22 deletions src/librustc_resolve/resolve_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1026,28 +1026,9 @@ fn import_path_to_string(names: &[SpannedIdent],
if names.is_empty() {
import_directive_subclass_to_string(subclass)
} else {
// FIXME: Remove this entire logic after #48116 is fixed.
//
// Note that this code looks a little wonky, it's currently here to
// hopefully help debug #48116, but otherwise isn't intended to
// cause any problems.
let x = format!(
"{}::{}",
names_to_string(names),
import_directive_subclass_to_string(subclass),
);
if names.is_empty() || x.starts_with("::") {
span_bug!(
span,
"invalid name `{}` at {:?}; global = {}, names = {:?}, subclass = {:?}",
x,
span,
global,
names,
subclass
);
}
return x
format!("{}::{}",
names_to_string(names),
import_directive_subclass_to_string(subclass))
}
}
}
Expand Down

0 comments on commit 0d8fa82

Please sign in to comment.