maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(cli): upgrade cli to 2024 edition

Browse source 
Part of #114
cli doesn't contain any unsafe

Change-Id: I65b573be5f9ff5c93b813a930df908d6aea6c799
Reviewed-on: https://cl.snix.dev/c/snix/+/30365
Tested-by: besadii
Reviewed-by: Florian Klink <flokli@flokli.de>
This commit is contained in:
Starnick4444 2025-04-30 23:19:46 +02:00 • committed by Bence Nemes
parent ef53fbfe3f
commit c501361412
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snix/Cargo.nix
View file

@ -14029,7 +14029,7 @@ rec {
"snix-cli" = rec { "snix-cli" = rec {
crateName = "snix-cli"; crateName = "snix-cli";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2024";
crateBin = [ crateBin = [
{ {
name = "snix"; name = "snix";

2
snix/cli/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "snix-cli" name = "snix-cli"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2024"
[[bin]] [[bin]]
name = "snix" name = "snix"

2
snix/cli/rustfmt.toml Normal file
View file

@ -0,0 +1,2 @@
# FUTUREWORK: move to .. once all crates are migrated (#114)
edition = "2024"

4
snix/cli/src/lib.rs
View file

@ -5,9 +5,9 @@ use rustc_hash::FxHashMap;
use smol_str::SmolStr; use smol_str::SmolStr;
use snix_build::buildservice; use snix_build::buildservice;
use snix_eval::{ use snix_eval::{
ErrorKind, EvalIO, EvalMode, GlobalsMap, SourceCode, Value,
builtins::impure_builtins, builtins::impure_builtins,
observer::{DisassemblingObserver, TracingObserver}, observer::{DisassemblingObserver, TracingObserver},
ErrorKind, EvalIO, EvalMode, GlobalsMap, SourceCode, Value,
}; };
use snix_glue::{ use snix_glue::{
builtins::{add_derivation_builtins, add_fetcher_builtins, add_import_builtins}, builtins::{add_derivation_builtins, add_fetcher_builtins, add_import_builtins},
@ -16,7 +16,7 @@ use snix_glue::{
snix_store_io::SnixStoreIO, snix_store_io::SnixStoreIO,
}; };
use std::fmt::Write; use std::fmt::Write;
use tracing::{info_span, Span}; use tracing::{Span, info_span};
use tracing_indicatif::span_ext::IndicatifSpanExt; use tracing_indicatif::span_ext::IndicatifSpanExt;
pub mod args; pub mod args;

4
snix/cli/src/main.rs
View file

@ -2,9 +2,9 @@ use clap::Parser;
use mimalloc::MiMalloc; use mimalloc::MiMalloc;
use snix_cli::args::Args; use snix_cli::args::Args;
use snix_cli::repl::Repl; use snix_cli::repl::Repl;
use snix_cli::{init_io_handle, interpret, AllowIncomplete}; use snix_cli::{AllowIncomplete, init_io_handle, interpret};
use snix_eval::observer::DisassemblingObserver;
use snix_eval::EvalMode; use snix_eval::EvalMode;
use snix_eval::observer::DisassemblingObserver;
use snix_glue::snix_store_io::SnixStoreIO; use snix_glue::snix_store_io::SnixStoreIO;
use std::io::Write; use std::io::Write;
use std::rc::Rc; use std::rc::Rc;

6
snix/cli/src/repl.rs
View file

@ -3,14 +3,14 @@ use std::path::PathBuf;
use std::rc::Rc; use std::rc::Rc;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use rustyline::{error::ReadlineError, Editor}; use rustyline::{Editor, error::ReadlineError};
use smol_str::SmolStr; use smol_str::SmolStr;
use snix_eval::{GlobalsMap, SourceCode, Value}; use snix_eval::{GlobalsMap, SourceCode, Value};
use snix_glue::snix_store_io::SnixStoreIO; use snix_glue::snix_store_io::SnixStoreIO;
use crate::{ use crate::{
assignment::Assignment, evaluate, interpret, AllowIncomplete, Args, IncompleteInput, AllowIncomplete, Args, IncompleteInput, InterpretResult, assignment::Assignment, evaluate,
InterpretResult, interpret,
}; };
fn state_dir() -> Option<PathBuf> { fn state_dir() -> Option<PathBuf> {