Update dependencies, Clippy fixes, add Nix flake (#97)

* updates

* updates

* updates

* updates

* updates

.envrc.example

@@ -0,0 +1,2 @@
+use flake
+dotenv_if_exists .env

.github/workflows/clippy.yml

@@ -4,11 +4,9 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features
+      - name: Clippy
+        run: cargo clippy --all-targets --all-features

.github/workflows/rust.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu

.gitignore

@@ -2,4 +2,5 @@
 **.vsix
 .DS_Store
 .idea
-.vscode
+.vscode
+.direnv

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
 members = [
-  "crates/melody_cli",
-  "crates/melody_compiler",
-  "crates/melody_wasm",
-  "xtask",
+    "crates/melody_cli",
+    "crates/melody_compiler",
+    "crates/melody_wasm",
+    "xtask",
 ]
 resolver = "2"
 

crates/melody_cli/Cargo.toml

@@ -6,27 +6,25 @@ repository = "https://github.com/yoav-lavi/melody"
 readme = "README.md"
 version = "0.19.0"
 edition = "2021"
-rust = "1.65.0"
 license = "MIT OR Apache-2.0"
 keywords = ["melody", "melodylang", "language", "cli"]
 categories = ["command-line-utilities"]
 
 [dependencies]
-clap = { version = "4.1.4", features = ["derive"] }
-colored = "2.0.0"
-thiserror = "1.0.31"
-anyhow = "1.0.58"
+clap = { version = "4", features = ["derive"] }
+colored = "2"
+thiserror = "2"
+anyhow = "1"
 melody_compiler = { version = "0.19.0", path = "../melody_compiler" }
-atty = "0.2.14"
-exitcode = "1.1.2"
-clap_complete = "4.1.1"
-regress = "0.6.0"
+exitcode = "1"
+clap_complete = "4"
+regress = "0.10"
 
 [dev-dependencies]
-assert_cmd = "2.0.4"
-assert_fs = "1.0.7"
-unindent = "0.2.2"
-tempfile = "3.3.0"
+assert_cmd = "2"
+assert_fs = "1"
+unindent = "0.2"
+tempfile = "3"
 
 [[bin]]
 name = "melody"

crates/melody_cli/src/main.rs

@@ -29,7 +29,7 @@ fn main() {
     ShouldColorize::from_env();
 
     match try_main() {
-        Ok(_) => process::exit(exitcode::OK),
+        Ok(()) => process::exit(exitcode::OK),
         Err(error) => handle_error(&error),
     };
 }

crates/melody_cli/src/types.rs

@@ -1,5 +1,5 @@
-use atty::Stream;
 use clap::Parser;
+use std::io::IsTerminal;
 
 #[derive(Parser, Debug)]
 #[clap(about, version, author)]
@@ -61,9 +61,9 @@ pub struct Streams {
 impl Streams {
     pub fn new() -> Self {
         Self {
-            stdin: !atty::is(Stream::Stdin),
-            stdout: !atty::is(Stream::Stdout),
-            // stderr: !atty::is(Stream::Stderr),
+            stdin: !std::io::stdin().is_terminal(),
+            stdout: !std::io::stdout().is_terminal(),
+            // stderr: !std::io::stderr().is_terminal(),
         }
     }
     pub const fn any_pipe(&self) -> bool {

crates/melody_compiler/Cargo.toml

@@ -6,7 +6,6 @@ repository = "https://github.com/yoav-lavi/melody"
 readme = "README.md"
 version = "0.19.0"
 edition = "2021"
-rust = "1.65.0"
 license = "MIT OR Apache-2.0"
 keywords = ["melody", "melodylang", "language", "compiler"]
 categories = ["compilers"]
@@ -15,15 +14,15 @@ categories = ["compilers"]
 fuzzer = ["arbitrary"]
 
 [dependencies]
-pest = "2.1.3"
-pest_derive = "2.1.0"
-once_cell = "1.12.0"
-arbitrary = { version = "1.1.3", features = ["derive"], optional = true }
-thiserror = "1.0.31"
+pest = "2"
+pest_derive = "2"
+once_cell = "1"
+arbitrary = { version = "1", features = ["derive"], optional = true }
+thiserror = "2"
 
 [dev-dependencies]
-criterion = "0.5.1"
-indoc = "2.0.3"
+criterion = "0.5"
+indoc = "2"
 
 [[bench]]
 name = "benchmark"

crates/melody_compiler/src/ast/utils.rs

@@ -52,7 +52,7 @@ pub fn unquote_escape_literal(pair: &Pair<'_, Rule>) -> String {
 
     match quote_type {
         '"' => literal.replace(r#"\""#, r#"""#),
-        '\'' => literal.replace(r#"\'"#, r#"'"#),
+        '\'' => literal.replace(r"\'", r"'"),
         _ => unreachable!(),
     }
 }