Adapt code to Rust 1.84.0 (#38)

Glistix · Jan 19, 2025 · f10d3eb · f10d3eb
1 parent 2a140e7
commit f10d3eb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -450,7 +450,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "20"
 
       - name: Install wasm-pack
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler-core/src/dependency.rs b/compiler-core/src/dependency.rs
@@ -69,7 +69,7 @@ fn parse_exact_version(ver: &str) -> Option<Version> {
     let first_byte = version.as_bytes().first();
 
     // Version is exact if it starts with an explicit == or a number
-    if version.starts_with("==") || first_byte.map_or(false, |v| v.is_ascii_digit()) {
+    if version.starts_with("==") || first_byte.is_some_and(|v| v.is_ascii_digit()) {
         let version = version.replace("==", "");
         let version = version.as_str().trim();
         if let Ok(v) = Version::parse(version) {

diff --git a/nix/glistix.nix b/nix/glistix.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
   buildInputs = [ openssl ] ++
     lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoHash = "sha256-/oJSGixb5WKg/OyoUtw6fa1wy/ObxLT8a5VLlZb0kOo=";
+  cargoHash = "sha256-g7deHhgIUReUEuAc2pk2HMAsGKXkyZrOg0/FArwrlRw=";
 
   meta = with lib; {
     description = "A fork of the Gleam compiler with a Nix backend";

diff --git a/test-helpers-rs/src/lib.rs b/test-helpers-rs/src/lib.rs
@@ -5,7 +5,7 @@ use glistix_core::{
 };
 use itertools::Itertools;
 use regex::Regex;
-use std::{collections::HashMap, fmt::Write, sync::OnceLock};
+use std::{collections::HashMap, fmt::Write, sync::LazyLock};
 
 #[derive(Debug)]
 pub struct TestCompileOutput {
@@ -45,9 +45,6 @@ impl TestCompileOutput {
 
                 Content::Text(text) => {
                     let text = FILE_LINE_REGEX
-                        .get_or_init(|| {
-                            Regex::new(r#"-file\("([^"]+)", (\d+)\)\."#).expect("Invalid regex")
-                        })
                         .replace_all(text, |caps: &regex::Captures| {
                             let path = caps
                                 .get(1)
@@ -95,7 +92,8 @@ pub fn to_in_memory_filesystem(path: &Utf8Path) -> InMemoryFileSystem {
     fs
 }
 
-static FILE_LINE_REGEX: OnceLock<Regex> = OnceLock::new();
+static FILE_LINE_REGEX: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r#"-file\("([^"]+)", (\d+)\)\."#).expect("Invalid regex"));
 
 pub fn normalise_diagnostic(text: &str) -> String {
     // There is an extra ^ on Windows in some error messages' code