about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiv Kaminer <nivkner@zoho.com>2018-03-17 01:28:55 +0200
committerNiv Kaminer <nivkner@zoho.com>2018-03-17 20:24:49 +0200
commit0d8fa82eab070481d7ac82da4735dd651dfa9a00 (patch)
tree3df6b7d44dba4898ebf614a9128ec2a3f72f835a
parent2c6b7b93230d4dcc99608538b43530e9e520215b (diff)
downloadrust-0d8fa82eab070481d7ac82da4735dd651dfa9a00.tar.gz
rust-0d8fa82eab070481d7ac82da4735dd651dfa9a00.zip
remove FIXME(#48116) and remove the logic to debug the issue
-rw-r--r--src/librustc_resolve/resolve_imports.rs25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 01c1ded9457..a73f660c405 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -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))
         }
     }
 }