Merge pull request #8443 from RazvanN7/checkAccess_err

Turn deprecation into error for issue 313 merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
dlang · Oct 25, 2018 · 01a6a5e · 01a6a5e
2 parents 8542543 + aca10e8
commit 01a6a5e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 16 deletions.
diff --git a/changelog/fqn_imports_bypass_private_imports_error.dd b/changelog/fqn_imports_bypass_private_imports_error.dd
@@ -0,0 +1,20 @@
+The deprecation phase for fully qualified names that bypassed private imports is finished
+
+---
+// a.d
+import std.stdio;
+---
+
+---
+// b.d
+import a;
+
+void main()
+{
+    std.stdio.writefln("foo");         // deprecation before patch, now errors
+}
+---
+
+In order to compile the example successfully, `public` needs to be added
+to the import located in `a.d` : `public import std.stdio;` or `import std.stdio;`
+needs to be added to `b.d`.
diff --git a/src/dmd/access.d b/src/dmd/access.d
@@ -457,9 +457,9 @@ bool checkAccess(Loc loc, Scope* sc, Package p)
     }
     auto name = p.toPrettyChars();
     if (p.isPkgMod == PKG.module_ || p.isModule())
-        deprecation(loc, "%s `%s` is not accessible here, perhaps add `static import %s;`", p.kind(), name, name);
+        error(loc, "%s `%s` is not accessible here, perhaps add `static import %s;`", p.kind(), name, name);
     else
-        deprecation(loc, "%s `%s` is not accessible here", p.kind(), name);
+        error(loc, "%s `%s` is not accessible here", p.kind(), name);
     return true;
 }
 

diff --git a/test/compilable/testDIP37.d b/test/compilable/testDIP37.d
@@ -30,7 +30,6 @@ void test7()
     static import pkgDIP37.datetime;
     static assert(!__traits(compiles, def()));
     pkgDIP37.datetime.def();
-    pkgDIP37.datetime.common.def();
 }
 
 // https://issues.dlang.org/show_bug.cgi?id=17629

diff --git a/test/fail_compilation/fail313.d b/test/fail_compilation/fail313.d
@@ -1,12 +1,11 @@
 /*
-REQUIRED_ARGS: -de
 TEST_OUTPUT:
 ---
-fail_compilation/fail313.d(18): Deprecation: module `imports.b313` is not accessible here, perhaps add `static import imports.b313;`
-fail_compilation/fail313.d(25): Deprecation: `imports.a313.core` is not visible from module `test313`
-fail_compilation/fail313.d(25): Deprecation: package `core.stdc` is not accessible here
-fail_compilation/fail313.d(25): Deprecation: module `core.stdc.stdio` is not accessible here, perhaps add `static import core.stdc.stdio;`
-fail_compilation/fail313.d(30): Deprecation: package `imports.pkg313` is not accessible here, perhaps add `static import imports.pkg313;`
+fail_compilation/fail313.d(17): Error: module `imports.b313` is not accessible here, perhaps add `static import imports.b313;`
+fail_compilation/fail313.d(24): Deprecation: `imports.a313.core` is not visible from module `test313`
+fail_compilation/fail313.d(24): Error: package `core.stdc` is not accessible here
+fail_compilation/fail313.d(24): Error: module `core.stdc.stdio` is not accessible here, perhaps add `static import core.stdc.stdio;`
+fail_compilation/fail313.d(29): Error: package `imports.pkg313` is not accessible here, perhaps add `static import imports.pkg313;`
 ---
 */
 module test313;

diff --git a/test/runnable/testdstress.d b/test/runnable/testdstress.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 
-module dstress.run.module_01;
+module run.module_01;
 
 import core.memory;
 import core.exception;
@@ -170,9 +170,9 @@ int i;
 
 void test7()
 {
-        assert(dstress.run.module_01.i==0);
-        dstress.run.module_01.i++;
-        assert(dstress.run.module_01.i==1);
+        assert(run.module_01.i==0);
+        run.module_01.i++;
+        assert(run.module_01.i==1);
 }
 
 /* ================================ */
@@ -699,7 +699,7 @@ void test32()
         assert(!(ti is null));
         writefln("%s %d %d", ti.toString(), ti.tsize, (MyUnion32*).sizeof);
         assert(ti.tsize==(MyUnion32*).sizeof);
-        assert(ti.toString()=="dstress.run.module_01.MyUnion32*");
+        assert(ti.toString()=="run.module_01.MyUnion32*");
 }
 
 /* ================================ */

diff --git a/test/runnable/testmodule.d b/test/runnable/testmodule.d
@@ -9,13 +9,13 @@
 // @uri@        news:ct428n$2qoe$1@digitaldaemon.com
 // @url@        nntp://news.digitalmars.com/D.gnu/983
 
-module dstress.run.unicode_06_哪里;
+module run.unicode_06_哪里;
 
 int 哪里(int ö){
         return ö+2;
 }
 
 int main(){
-        assert(dstress.run.unicode_06_哪里.哪里(2)==4);
+        assert(run.unicode_06_哪里.哪里(2)==4);
         return 0;
 }