Update dependencies

- Remove `packagesFromDirectory` because
  `lib.packagesFromDirectoryRecursive` is upstreamed now
- Update Nix and Rust dependencies
- Add GHC 9.8 to the test suite

flake.nix

@@ -5,7 +5,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs";
     crane = {
       url = "github:ipetkov/crane";
-      inputs.flake-compat.follows = "flake-compat";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     systems.url = "github:nix-systems/default";
@@ -78,6 +77,7 @@
       "ghc92"
       "ghc94"
       "ghc96"
+      "ghc98"
     ];
   in {
     packages = eachSystem (

nix/makePackages.nix

@@ -4,11 +4,10 @@
   inputs,
 }:
 lib.makeScope newScope (
-  self: let
-    packagesFromDirectory = (import ./packagesFromDirectory.nix) {
-      inherit lib;
+  self:
+    {inherit inputs;}
+    // (lib.packagesFromDirectoryRecursive {
       inherit (self) callPackage;
-    };
-  in
-    {inherit inputs;} // (packagesFromDirectory ./packages)
+      directory = ./packages;
+    })
 )

src/ghci/parse/ghc_message/mod.rs

@@ -9,7 +9,6 @@ use winnow::combinator::fold_repeat;
 use winnow::prelude::*;
 
 mod position;
-pub use position::Position;
 pub use position::PositionRange;
 
 mod severity;

src/ghci/parse/ghc_message/path_colon.rs

@@ -1,13 +1,13 @@
 use camino::Utf8Path;
 use winnow::combinator::terminated;
-use winnow::token::take_till1;
+use winnow::token::take_till;
 use winnow::PResult;
 use winnow::Parser;
 
 /// A filename, followed by a `:`.
 pub fn path_colon<'i>(input: &mut &'i str) -> PResult<&'i Utf8Path> {
     // TODO: Support Windows drive letters.
-    terminated(take_till1((':', '\n')), ":")
+    terminated(take_till(1.., (':', '\n')), ":")
         .parse_next(input)
         .map(Utf8Path::new)
 }

src/ghci/parse/mod.rs

@@ -20,8 +20,6 @@ pub use ghc_message::CompilationResult;
 pub use ghc_message::CompilationSummary;
 pub use ghc_message::GhcDiagnostic;
 pub use ghc_message::GhcMessage;
-pub use ghc_message::Position;
-pub use ghc_message::PositionRange;
 pub use ghc_message::Severity;
 pub use module_and_files::Module;
 pub use module_set::ModuleSet;

src/ghci/parse/module_and_files.rs

@@ -10,7 +10,7 @@ use winnow::error::ContextError;
 use winnow::error::ErrMode;
 use winnow::error::StrContext;
 use winnow::error::StrContextValue;
-use winnow::token::take_till1;
+use winnow::token::take_till;
 use winnow::token::take_until1;
 use winnow::PResult;
 use winnow::Parser;
@@ -58,7 +58,7 @@ pub fn module_and_files(input: &mut &str) -> PResult<Module> {
 
     // Parse this bit: `( Foo.hs, Foo.o, interpreted )`
     let _ = "( ".parse_next(input)?;
-    let mut paths: Vec<_> = repeat(0.., (take_till1((',', '\n')), ", ")).parse_next(input)?;
+    let mut paths: Vec<_> = repeat(0.., (take_till(1.., (',', '\n')), ", ")).parse_next(input)?;
     let final_path = (take_until1(" )"), " )").parse_next(input)?;
     paths.push(final_path);
 

test-harness/src/ghc_version.rs

@@ -41,6 +41,8 @@ pub enum GhcVersion {
     Ghc94,
     /// GHC 9.6
     Ghc96,
+    /// GHC 9.8
+    Ghc98,
 }
 
 fn ghc_version_re() -> &'static Regex {
@@ -63,8 +65,9 @@ impl FromStr for GhcVersion {
             ("9", "2") => Ok(Self::Ghc92),
             ("9", "4") => Ok(Self::Ghc94),
             ("9", "6") => Ok(Self::Ghc96),
+            ("9", "8") => Ok(Self::Ghc98),
             (_, _) => Err(miette!(
-                "Only GHC versions 9.0, 9.2, 9.4, and 9.6 are supported"
+                "Only GHC versions 9.0, 9.2, 9.4, 9.6, and 9.8 are supported"
             )),
         }
     }

test-harness/src/lib.rs

@@ -13,6 +13,7 @@ mod matcher;
 pub use matcher::BaseMatcher;
 pub use matcher::IntoMatcher;
 pub use matcher::Matcher;
+pub use matcher::OptionMatcher;
 pub use matcher::OrMatcher;
 
 mod fs;

tests/error_log.rs

@@ -91,7 +91,7 @@ async fn can_write_error_log_compilation_errors() {
             3 | myIdent = "Uh oh!"
               |           ^^^^^^^^
         "#]],
-        Ghc96 => expect![[r#"
+        Ghc96 | Ghc98 => expect![[r#"
             src/My/Module.hs:3:11: error: [GHC-83865]
                 * Couldn't match type `[Char]' with `()'
                   Expected: ()