Skip to content

DUX-5111 Remove GHC 9.4 support #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
9999years merged 1 commit into from
Apr 28, 2026
+10 −29
Merged

DUX-5111 Remove GHC 9.4 support #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions test-harness/src/ghc_version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ impl Display for FullGhcVersion {
/// Variants of this enum will correspond to `ghcVersions` in `../../flake.nix`.
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub enum GhcVersion {
/// GHC 9.4
Ghc94,
/// GHC 9.6
Ghc96,
/// GHC 9.8
Expand All @@ -61,14 +59,12 @@ impl FromStr for GhcVersion {
let (_full, [major, minor, _patch]) = captures.extract();

match (major, minor) {
("9", "4") => Ok(Self::Ghc94),
("9", "6") => Ok(Self::Ghc96),
("9", "8") => Ok(Self::Ghc98),
("9", "10") => Ok(Self::Ghc910),
("9", "12") => Ok(Self::Ghc912),
(_, _) => Err(eyre!(
"Only the following GHC versions are supported:\n\
- 9.4\n\
- 9.6\n\
- 9.8\n\
- 9.10\n\
Expand All @@ -84,26 +80,26 @@ mod tests {

#[test]
fn test_parse_ghc_version() {
assert_eq!("9.4.8".parse::<GhcVersion>().unwrap(), GhcVersion::Ghc94);
assert_eq!("9.6.1".parse::<GhcVersion>().unwrap(), GhcVersion::Ghc96);
assert_eq!("9.10.1".parse::<GhcVersion>().unwrap(), GhcVersion::Ghc910);
assert_eq!("9.12.1".parse::<GhcVersion>().unwrap(), GhcVersion::Ghc910);

"9.6.1rc1"
let _ = "9.6.1rc1"
.parse::<GhcVersion>()
.expect_err("Extra information at the end");
"9.6.1-pre"
let _ = "9.6.1-pre"
.parse::<GhcVersion>()
.expect_err("Extra information at the end");
"9.6.1.2"
let _ = "9.6.1.2"
.parse::<GhcVersion>()
.expect_err("Extra version component");
"9.6"
let _ = "9.6"
.parse::<GhcVersion>()
.expect_err("Missing patch version component");
"9".parse::<GhcVersion>()
let _ = "9"
.parse::<GhcVersion>()
.expect_err("Missing patch and minor version components");
"a.b.c"
let _ = "a.b.c"
.parse::<GhcVersion>()
.expect_err("Non-numeric components");
}
Expand Down
21 changes: 3 additions & 18 deletions tests/error_log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use indoc::indoc;

use test_harness::test;
use test_harness::BaseMatcher;
use test_harness::GhcVersion::*;
use test_harness::GhciWatchBuilder;

/// Test that `ghciwatch --errors ...` can write the error log.
Expand Down Expand Up @@ -84,19 +83,7 @@ async fn can_write_error_log_compilation_errors() {
.await
.expect("ghciwatch writes ghcid.txt");

let expected = match session.ghc_version() {
Ghc94 => expect![[r#"
src/My/Module.hs:3:11: error:
* Couldn't match type `[Char]' with `()'
Expected: ()
Actual: String
* In the expression: "Uh oh!"
In an equation for `myIdent': myIdent = "Uh oh!"
|
3 | myIdent = "Uh oh!"
| ^^^^^^^^
"#]],
Ghc96 | Ghc98 | Ghc910 | Ghc912 => expect![[r#"
expect![[r#"
src/My/Module.hs:3:11: error: [GHC-83865]
* Couldn't match type `[Char]' with `()'
Expected: ()
Expand All @@ -106,10 +93,8 @@ async fn can_write_error_log_compilation_errors() {
|
3 | myIdent = "Uh oh!"
| ^^^^^^^^
"#]],
};

expected.assert_eq(&error_contents);
"#]]
.assert_eq(&error_contents);

session
.fs()
Expand Down