API Annotations: make all ModuleName Located

Summary:
This also changes the backpack Renaming type to use a Maybe for the
renameTo field, to more accurately reflect the parsed source.

Updates haddock submodule to match AST changes

Test Plan: ./validate

Reviewers: ezyang, bgamari, austin

Reviewed By: bgamari

Subscribers: thomie, mpickering

Differential Revision: https://phabricator.haskell.org/D2670

5 files changed, 7 insertions, 15 deletions

diff --git a/testsuite/tests/ghc-api/annotations/T10312.stdout b/testsuite/tests/ghc-api/annotations/T10312.stdout
index 00f25444cc..c8dff60b10 100644
--- a/testsuite/tests/ghc-api/annotations/T10312.stdout
+++ b/testsuite/tests/ghc-api/annotations/T10312.stdout
@@ -12,7 +12,6 @@
 ((Test10312.hs:9:1-30,AnnImport), [Test10312.hs:9:1-6]),
 ((Test10312.hs:9:1-30,AnnQualified), [Test10312.hs:9:8-16]),
 ((Test10312.hs:9:1-30,AnnSemi), [Test10312.hs:10:1]),
-((Test10312.hs:9:1-30,AnnVal), [Test10312.hs:9:30]),
 ((Test10312.hs:10:1-27,AnnImport), [Test10312.hs:10:1-6]),
 ((Test10312.hs:10:1-27,AnnSemi), [Test10312.hs:11:1]),
 ((Test10312.hs:10:17-27,AnnCloseP), [Test10312.hs:10:27]),
diff --git a/testsuite/tests/ghc-api/annotations/annotations.stdout b/testsuite/tests/ghc-api/annotations/annotations.stdout
index e465403483..f0348058ba 100644
--- a/testsuite/tests/ghc-api/annotations/annotations.stdout
+++ b/testsuite/tests/ghc-api/annotations/annotations.stdout
@@ -19,8 +19,6 @@
 
 (AK AnnotationLet.hs:5:1-32 AnnSemi = [AnnotationLet.hs:6:1])
 
-(AK AnnotationLet.hs:5:1-32 AnnVal = [AnnotationLet.hs:5:31-32])
-
 (AK AnnotationLet.hs:(7,1)-(11,12) AnnEqual = [AnnotationLet.hs:7:5])
 
 (AK AnnotationLet.hs:(7,1)-(11,12) AnnFunId = [AnnotationLet.hs:7:1-3])
diff --git a/testsuite/tests/ghc-api/annotations/exampleTest.stdout b/testsuite/tests/ghc-api/annotations/exampleTest.stdout
index a884f56a32..2cdef957d3 100644
--- a/testsuite/tests/ghc-api/annotations/exampleTest.stdout
+++ b/testsuite/tests/ghc-api/annotations/exampleTest.stdout
@@ -14,7 +14,6 @@
 ((AnnotationTuple.hs:6:1-32,AnnImport), [AnnotationTuple.hs:6:1-6]),
 ((AnnotationTuple.hs:6:1-32,AnnQualified), [AnnotationTuple.hs:6:8-16]),
 ((AnnotationTuple.hs:6:1-32,AnnSemi), [AnnotationTuple.hs:7:1]),
-((AnnotationTuple.hs:6:1-32,AnnVal), [AnnotationTuple.hs:6:31-32]),
 ((AnnotationTuple.hs:(8,1)-(11,14),AnnEqual), [AnnotationTuple.hs:8:5]),
 ((AnnotationTuple.hs:(8,1)-(11,14),AnnFunId), [AnnotationTuple.hs:8:1-3]),
 ((AnnotationTuple.hs:(8,1)-(11,14),AnnSemi), [AnnotationTuple.hs:13:1]),
diff --git a/testsuite/tests/ghc-api/annotations/listcomps.stdout b/testsuite/tests/ghc-api/annotations/listcomps.stdout
index 1c0b8e5ce4..3965257bb3 100644
--- a/testsuite/tests/ghc-api/annotations/listcomps.stdout
+++ b/testsuite/tests/ghc-api/annotations/listcomps.stdout
@@ -1,13 +1,13 @@
 {ListComprehensions.hs:1:1, ListComprehensions.hs:6:8-25,
  ListComprehensions.hs:10:1-15, ListComprehensions.hs:10:8-15,
  ListComprehensions.hs:11:1-30, ListComprehensions.hs:11:18-25,
- ListComprehensions.hs:12:1-27, ListComprehensions.hs:12:8-15,
- ListComprehensions.hs:12:17-27, ListComprehensions.hs:12:18-26,
- ListComprehensions.hs:13:1-25, ListComprehensions.hs:13:8-16,
- ListComprehensions.hs:13:18-25, ListComprehensions.hs:13:19-24,
- ListComprehensions.hs:17:1-16, ListComprehensions.hs:17:1-25,
- ListComprehensions.hs:17:21-25, ListComprehensions.hs:17:22-24,
- ListComprehensions.hs:18:1-16,
+ ListComprehensions.hs:11:30, ListComprehensions.hs:12:1-27,
+ ListComprehensions.hs:12:8-15, ListComprehensions.hs:12:17-27,
+ ListComprehensions.hs:12:18-26, ListComprehensions.hs:13:1-25,
+ ListComprehensions.hs:13:8-16, ListComprehensions.hs:13:18-25,
+ ListComprehensions.hs:13:19-24, ListComprehensions.hs:17:1-16,
+ ListComprehensions.hs:17:1-25, ListComprehensions.hs:17:21-25,
+ ListComprehensions.hs:17:22-24, ListComprehensions.hs:18:1-16,
  ListComprehensions.hs:(18,1)-(22,20),
  ListComprehensions.hs:(18,18)-(22,20),
  ListComprehensions.hs:(18,20)-(22,20), ListComprehensions.hs:18:22,
@@ -55,8 +55,6 @@
 
 (AK ListComprehensions.hs:11:1-30 AnnSemi = [ListComprehensions.hs:12:1])
 
-(AK ListComprehensions.hs:11:1-30 AnnVal = [ListComprehensions.hs:11:30])
-
 (AK ListComprehensions.hs:12:1-27 AnnImport = [ListComprehensions.hs:12:1-6])
 
 (AK ListComprehensions.hs:12:1-27 AnnSemi = [ListComprehensions.hs:13:1])
diff --git a/testsuite/tests/ghc-api/annotations/parseTree.stdout b/testsuite/tests/ghc-api/annotations/parseTree.stdout
index 46b1c4fbb4..092ba971d2 100644
--- a/testsuite/tests/ghc-api/annotations/parseTree.stdout
+++ b/testsuite/tests/ghc-api/annotations/parseTree.stdout
@@ -30,8 +30,6 @@
 
 (AK AnnotationTuple.hs:6:1-32 AnnSemi = [AnnotationTuple.hs:7:1])
 
-(AK AnnotationTuple.hs:6:1-32 AnnVal = [AnnotationTuple.hs:6:31-32])
-
 (AK AnnotationTuple.hs:(8,1)-(11,14) AnnEqual = [AnnotationTuple.hs:8:5])
 
 (AK AnnotationTuple.hs:(8,1)-(11,14) AnnFunId = [AnnotationTuple.hs:8:1-3])