Skip to content

Commit

Permalink
bump to rust 1.73
Browse files Browse the repository at this point in the history
  • Loading branch information
nbittich committed Oct 6, 2023
1 parent d65695e commit 9b9fa64
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adana"
rust-version = "1.72"
rust-version = "1.73"

version = "0.15.2"
edition = "2021"
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.72.1-bullseye as builder
FROM rust:1.73-bookworm as builder

WORKDIR /app

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
4 changes: 2 additions & 2 deletions dynamic_lib/example_lib_src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dynamic_lib/example_lib_src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "stable"
host = "1.72.1"
host = "1.73"
2 changes: 1 addition & 1 deletion src/adana_script/require_dynamic_lib.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 3 additions & 5 deletions src/editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 9b9fa64

Please sign in to comment.