Skip to content

Commit 0d8fa82

Browse files
committed
remove FIXME(rust-lang#48116) and remove the logic to debug the issue
1 parent 2c6b7b9 commit 0d8fa82

File tree

1 file changed

+3
-22
lines changed

1 file changed

+3
-22
lines changed

src/librustc_resolve/resolve_imports.rs

+3-22
Original file line numberDiff line numberDiff line change
@@ -1026,28 +1026,9 @@ fn import_path_to_string(names: &[SpannedIdent],
10261026
if names.is_empty() {
10271027
import_directive_subclass_to_string(subclass)
10281028
} else {
1029-
// FIXME: Remove this entire logic after #48116 is fixed.
1030-
//
1031-
// Note that this code looks a little wonky, it's currently here to
1032-
// hopefully help debug #48116, but otherwise isn't intended to
1033-
// cause any problems.
1034-
let x = format!(
1035-
"{}::{}",
1036-
names_to_string(names),
1037-
import_directive_subclass_to_string(subclass),
1038-
);
1039-
if names.is_empty() || x.starts_with("::") {
1040-
span_bug!(
1041-
span,
1042-
"invalid name `{}` at {:?}; global = {}, names = {:?}, subclass = {:?}",
1043-
x,
1044-
span,
1045-
global,
1046-
names,
1047-
subclass
1048-
);
1049-
}
1050-
return x
1029+
format!("{}::{}",
1030+
names_to_string(names),
1031+
import_directive_subclass_to_string(subclass))
10511032
}
10521033
}
10531034
}

0 commit comments

Comments
 (0)