Merge pull request #5800 from dlang/revert-5724-fix-15925-stable

Revert "[REG 2.071] Fix Issue 15925 - Import declaration from mixin templates are ignored"
dlang · May 22, 2016 · 64f3fdb · 64f3fdb
2 parents f8d8225 + f0f3838
commit 64f3fdb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 25 deletions.
diff --git a/src/dsymbol.d b/src/dsymbol.d
@@ -1309,7 +1309,7 @@ public:
                     if (flags & SearchLocalsOnly)
                         continue;
                 }
-                else if (!ss.isTemplateMixin)
+                else
                 {
                     if (flags & SearchImportsOnly)
                         continue;

diff --git a/test/compilable/imports/test15925.d b/test/compilable/imports/test15925.d
diff --git a/test/compilable/imports/test15925thread.d b/test/compilable/imports/test15925thread.d
diff --git a/test/compilable/test15925.d b/test/compilable/test15925.d