Merge #4226

4226: Fix items resoution from prelude on the nightly Rust r=Undin a=vlad20012 Co-authored-by: vlad20012 <beskvlad@gmail.com>
intellij-rust · Aug 5, 2019 · 2d00711 · 2d00711
2 parents d440658 + 6b9f2a5
commit 2d00711
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/kotlin/org/rust/lang/core/resolve/NameResolution.kt b/src/main/kotlin/org/rust/lang/core/resolve/NameResolution.kt
@@ -1336,7 +1336,9 @@ fun processNestedScopesUpwards(
 
     val prelude = findPrelude(scopeStart)
     if (prelude != null) {
-        val preludeProcessor: (ScopeEntry) -> Boolean = { v -> v.name !in prevScope && processor(v) }
+        // XXX: fix prelude items resolve on the nightly. Revert it to `v -> v.name !in prevScope`
+        //   after cfg attrs support or when `#[cfg(bootstrap)]` will be removed from the prelude
+        val preludeProcessor: (ScopeEntry) -> Boolean = { v -> prevScope.add(v.name) && processor(v) }
         return processItemDeclarationsWithCache(prelude, ns, preludeProcessor, ItemProcessingMode.WITHOUT_PRIVATE_IMPORTS)
     }