diff --git a/Cargo.lock b/Cargo.lock index 578bd99..62953a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "adana-script-core" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb963f08f0acb3c4c5d9dcaa6b3963de537560e50d08c706efe22730b781ce" +checksum = "be4af3097a4b9683de773942390356318ccbd8c76150f5a03749ef6723d9a400" dependencies = [ "anyhow", "libloading", diff --git a/Cargo.toml b/Cargo.toml index 6b204c7..6954265 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adana" -rust-version = "1.72" +rust-version = "1.73" version = "0.15.2" edition = "2021" @@ -37,7 +37,7 @@ strum = { version = "0.25.0", features = ["derive"] } ctrlc = "3.4.1" #adana-script-core = { git = "https://github.com/nbittich/adana-script-core.git", branch = "feature/bitwise-and-new-ints" } -adana-script-core = "0.15.0" +adana-script-core = "0.15.1" arboard = "3.2.1" [dependencies.env_logger] diff --git a/Dockerfile b/Dockerfile index 19e64f2..4bc856b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.72.1-bullseye as builder +FROM rust:1.73-bookworm as builder WORKDIR /app @@ -24,7 +24,7 @@ RUN rm ./target/release/deps/adana* RUN cargo build --release -FROM rust:1.72.1-bullseye +FROM rust:1.73-slim-bookworm ENV RUST_LOG=info diff --git a/README.md b/README.md index 9a4341f..0d33290 100644 --- a/README.md +++ b/README.md @@ -356,7 +356,7 @@ If it is not installed yet, you will see instructions on how to install it, e.g: std lib doesn't exist: "/home/nbittich/.local/share/.libs_adana/adana-std/fs.so". Try to install it like so: - - wget -P /tmp https://github.com/nbittich/adana-std/releases/download/0.0.5/adana-std.tar.gz + - wget -P /tmp https://github.com/nbittich/adana-std/releases/download/0.0.6/adana-std.tar.gz - mkdir /home/nbittich/.local/share/.libs_adana/adana-std && tar xvzf /tmp/adana-std.tar.gz \ -C /home/nbittich/.local/share/.libs_adana/adana-std ``` diff --git a/dynamic_lib/example_lib_src/Cargo.lock b/dynamic_lib/example_lib_src/Cargo.lock index 18f68ee..efb8da7 100644 --- a/dynamic_lib/example_lib_src/Cargo.lock +++ b/dynamic_lib/example_lib_src/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "adana-script-core" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb963f08f0acb3c4c5d9dcaa6b3963de537560e50d08c706efe22730b781ce" +checksum = "be4af3097a4b9683de773942390356318ccbd8c76150f5a03749ef6723d9a400" dependencies = [ "anyhow", "libloading", diff --git a/dynamic_lib/example_lib_src/Cargo.toml b/dynamic_lib/example_lib_src/Cargo.toml index 69322d5..0a28a7d 100644 --- a/dynamic_lib/example_lib_src/Cargo.toml +++ b/dynamic_lib/example_lib_src/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" crate-type = ["dylib"] [dependencies] -adana-script-core = "0.15.0" +adana-script-core = "0.15.1" #adana-script-core = { git = "https://github.com/nbittich/adana-script-core.git", branch = "feature/bitwise-and-new-ints" } anyhow = "1.0.75" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index ac8ea95..e6a0a87 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] channel = "stable" -host = "1.72.1" +host = "1.73" diff --git a/src/adana_script/require_dynamic_lib.rs b/src/adana_script/require_dynamic_lib.rs index 52843df..2812893 100644 --- a/src/adana_script/require_dynamic_lib.rs +++ b/src/adana_script/require_dynamic_lib.rs @@ -1,5 +1,5 @@ const STD_DOWNLOAD_URI: &str = - "https://github.com/nbittich/adana-std/releases/download/0.0.5/adana-std.tar.gz"; + "https://github.com/nbittich/adana-std/releases/download/0.0.6/adana-std.tar.gz"; use std::{ path::Path, diff --git a/src/editor.rs b/src/editor.rs index 65a823c..9b652ea 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -9,7 +9,7 @@ use rustyline::{ Cmd, CompletionType, Config, EditMode, Editor, KeyEvent, Movement, }; use rustyline_derive::*; -use std::path::{Path, PathBuf, MAIN_SEPARATOR}; +use std::path::{Path, MAIN_SEPARATOR}; use std::process::Command; use adana_script_core::constants::PI; @@ -48,10 +48,8 @@ pub fn read_line( // show current dir & replace home dir by ~ let path = if let Ok(path) = std::env::current_dir() { let path = path.to_string_lossy().to_string(); - let home = dirs::home_dir() - .unwrap_or(PathBuf::new()) - .to_string_lossy() - .to_string(); + let home = + dirs::home_dir().unwrap_or_default().to_string_lossy().to_string(); let path = path.replace(&home, "~"); character_count += path.len(); Some(path)