Merge branch 'devel' into expand-amb-identifier-output

tests/modules/mnotuniquename.nim

@@ -0,0 +1 @@
+proc flat*() = echo "flat"

tests/modules/tnotuniquename.nim

@@ -1,7 +1,10 @@
 discard """
-  errormsg: "module names need to be unique per Nimble package"
-  file: "tnotuniquename/mnotuniquename.nim"
+  output: '''nested
+flat'''
 """
 
 import mnotuniquename
-import tnotuniquename/mnotuniquename as nun
+import tnotuniquename_dir/mnotuniquename as nun
+
+nested()
+flat()

tests/modules/tnotuniquename2.nim

@@ -1,6 +1,7 @@
 discard """
   errormsg: "module names need to be unique per Nimble package"
   file: "tnotuniquename/mnotuniquename.nim"
+  disabled: "true"
 """
 
 import mnotuniquename

tests/modules/tnotuniquename_dir/mnotuniquename.nim

@@ -0,0 +1,2 @@
+
+proc nested*() = echo "nested"