hlint

Author: wz1000

ghcide/.hlint.yaml

@@ -98,6 +98,7 @@
   - default: false
   - {name: [-Wno-missing-signatures, -Wno-orphans, -Wno-overlapping-patterns, -Wno-incomplete-patterns, -Wno-missing-fields, -Wno-unused-matches]}
   - {name: [-Wno-dodgy-imports,-Wno-incomplete-uni-patterns], within: [Main, Development.IDE.GHC.Compat, Development.Benchmark.Rules]}
+  - {name: [-Wno-deprecations, -Wno-unticked-promoted-constructors], within: [Main, Experiments]}
 # - modules:
 #   - {name: [Data.Set, Data.HashSet], as: Set} # if you import Data.Set qualified, it must be as 'Set'
 #   - {name: Control.Arrow, within: []} # Certain modules are banned entirely

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/CodeLens.hs

@@ -110,10 +110,7 @@ import GHC
       setTargets,
       typeKind,
     )
-<<<<<<< HEAD
-=======
 import qualified GHC.LanguageExtensions.Type as LangExt
->>>>>>> c608a0f5 (rebase fixes)
 import GhcPlugins
     ( DynFlags (..),
       hsc_dflags,