diff options
| author | Emily Martins <emi@haskell.fyi> | 2021-08-08 15:41:51 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-10-19 22:21:26 -0400 |
| commit | f8ce38e62c19fb346f33b246efc205fb37999d14 (patch) | |
| tree | 8f5b843988a680b64b45762b54d8db586f2ac4a9 | |
| parent | 79c9c816ac1866881f90ea7e6d5c182b54780a97 (diff) | |
| download | haskell-f8ce38e62c19fb346f33b246efc205fb37999d14.tar.gz | |
Fix #19884: add warning to tags command, drop T10989
| -rw-r--r-- | ghc/GHCi/UI/Tags.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T10989.script | 15 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T10989.stderr | 6 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T10989.stdout | 2 | ||||
| -rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 1 |
5 files changed, 2 insertions, 24 deletions
diff --git a/ghc/GHCi/UI/Tags.hs b/ghc/GHCi/UI/Tags.hs index 94e7557410..410b2c5927 100644 --- a/ghc/GHCi/UI/Tags.hs +++ b/ghc/GHCi/UI/Tags.hs @@ -63,6 +63,8 @@ data TagsKind = ETags | CTagsWithLineNumbers | CTagsWithRegExes ghciCreateTagsFile :: TagsKind -> FilePath -> GHCi () ghciCreateTagsFile kind file = do + liftIO $ putStrLn "Tags generation from GHCi will be deprecated in future releases" + liftIO $ putStrLn "Use the method described in https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/GHCi/Tags" createTagsFile kind file -- ToDo: diff --git a/testsuite/tests/ghci/scripts/T10989.script b/testsuite/tests/ghci/scripts/T10989.script deleted file mode 100644 index d109e4eeda..0000000000 --- a/testsuite/tests/ghci/scripts/T10989.script +++ /dev/null @@ -1,15 +0,0 @@ -writeFile "dummy.hs" "t = putStrLn \"Test\"" -writeFile "dummy.lhs" "> t = putStrLn \"Test\"" -:ctags dummy.hs -:ctags dummy.lhs -:ctags! dummy.hs -:ctags! dummy.lhs -:etags dummy.hs -:etags dummy.lhs -:ctags dummy.tags -:ctags! dummy.tags -:etags dummy.tags -:l dummy.hs -t -:l dummy.lhs -t diff --git a/testsuite/tests/ghci/scripts/T10989.stderr b/testsuite/tests/ghci/scripts/T10989.stderr deleted file mode 100644 index 97b0d90ccf..0000000000 --- a/testsuite/tests/ghci/scripts/T10989.stderr +++ /dev/null @@ -1,6 +0,0 @@ -dummy.hs is existing source file. Please specify another file name to store tags data -dummy.lhs is existing source file. Please specify another file name to store tags data -dummy.hs is existing source file. Please specify another file name to store tags data -dummy.lhs is existing source file. Please specify another file name to store tags data -dummy.hs is existing source file. Please specify another file name to store tags data -dummy.lhs is existing source file. Please specify another file name to store tags data diff --git a/testsuite/tests/ghci/scripts/T10989.stdout b/testsuite/tests/ghci/scripts/T10989.stdout deleted file mode 100644 index 95306f6347..0000000000 --- a/testsuite/tests/ghci/scripts/T10989.stdout +++ /dev/null @@ -1,2 +0,0 @@ -Test -Test diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index c47b3b0569..80f3eb8f02 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -234,7 +234,6 @@ test('T10501', normal, ghci_script, ['T10501.script']) test('T10508', normal, ghci_script, ['T10508.script']) test('T10520', normal, ghci_script, ['T10520.script']) test('T10663', normal, ghci_script, ['T10663.script']) -test('T10989', [], ghci_script, ['T10989.script']) test('T11098', normal, ghci_script, ['T11098.script']) test('T8316', expect_broken(8316), ghci_script, ['T8316.script']) test('T11252', normal, ghci_script, ['T11252.script']) |