Update/upgrade deps

Cargo.toml

@@ -22,24 +22,24 @@ categories = ['command-line-interface', 'command-line-utilities']
 include = ['src/**/*', 'docs/en/src/**/*', 'LICENSE', 'README.md']
 
 [dependencies]
-libc = "0.2.144"
+libc = "0.2.147"
 humansize = "2.1.3"
 natord = "1.0.9"
 anyhow = "1.0.71"
-serde_yaml = "0.9.21"
+serde_yaml = "0.9.22"
 crossterm = { version = "0.26.1", features = [], default-features = false }
-ansi-to-tui = "3.0.0"
+ansi-to-tui = "3.1.0"
-regex = "1.8.1"
+regex = "1.9.1"
 gethostname = "0.4.3"
-serde_json = "1.0.96"
+serde_json = "1.0.102"
 path-absolutize = "3.1.0"
 which = "4.4.0"
-nu-ansi-term = "0.47.0"
+nu-ansi-term = "0.48.0"
 textwrap = "0.16"
 snailquote = "0.3.1"
 skim = { version = "0.10.4", default-features = false }
-time = { version = "0.3.21", features = ["serde", "local-offset", "formatting", "macros"] }
+time = { version = "0.3.23", features = ["serde", "local-offset", "formatting", "macros"] }
-jf = "0.3.1"
+jf = "0.6.2"
 xdg = "2.5.0"
 home = "0.5.5"
 
@@ -57,18 +57,18 @@ version = "2.0.4"
 default-features = false
 
 [dependencies.tui]
-version = "0.20.1"
+version = "0.21.0"
 default-features = false
 features = ['crossterm', 'serde']
 package = 'ratatui'
 
 [dependencies.serde]
-version = "1.0.163"
+version = "1.0.171"
 features = []
 default-features = false
 
 [dependencies.indexmap]
-version = "1.9.3"
+version = "2.0.0"
 features = ['serde']
 
 [dependencies.mlua]
@@ -76,12 +76,12 @@ version = "0.8.9"
 features = ['luajit', 'vendored', 'serialize', 'send']
 
 [dependencies.tui-input]
-version = "0.7.0"
+version = "0.7.1"
 features = ['serde']
 
 [dev-dependencies]
-criterion = "0.4.0"
+criterion = "0.5.1"
-assert_cmd = "2.0.11"
+assert_cmd = "2.0.12"
 
 [profile.release]
 lto = true

flake.nix

@@ -17,6 +17,7 @@
         "i686-linux"
         "x86_64-darwin"
         "aarch64-linux"
+        "aarch64-linux-android"
         "aarch64-darwin"
       ];
       forAllSystems = f: builtins.listToAttrs (map (name: { inherit name; value = f name; }) systems);

src/cli.rs

@@ -206,12 +206,10 @@ pub fn print_msg_in(args: Vec<String>) -> Result<()> {
 fn fmt_msg_in(args: Vec<String>) -> Result<String> {
     let msg = match jf::format(args.into_iter().map(Into::into)) {
         Ok(msg) => msg,
-        Err(jf::Error::Usage) => {
-            bail!("usage: xplr -m TEMPLATE [VALUE]... [NAME=VALUE]...")
-        }
         Err(jf::Error::Jf(e)) => bail!("xplr -m: {e}"),
         Err(jf::Error::Json(e)) => bail!("xplr -m: json: {e}"),
         Err(jf::Error::Yaml(e)) => bail!("xplr -m: yaml: {e}"),
+        Err(jf::Error::Io(e)) => bail!("xplr -m: io: {e}"),
     };
 
     // validate

src/ui.rs

@@ -20,7 +20,7 @@ use tui::backend::Backend;
 use tui::layout::Rect as TuiRect;
 use tui::layout::{Constraint as TuiConstraint, Direction, Layout as TuiLayout};
 use tui::style::{Color, Modifier as TuiModifier, Style as TuiStyle};
-use tui::text::{Span, Spans, Text};
+use tui::text::{Line, Span, Text};
 use tui::widgets::{
     Block, BorderType as TuiBorderType, Borders as TuiBorders, Cell, List, ListItem,
     Paragraph, Row, Table,
@@ -401,22 +401,22 @@ impl Into<nu_ansi_term::Style> for Style {
             style.add_modifiers.as_ref().map_or(false, f)
         }
 
-        nu_ansi_term::Style {
+        let mut style = nu_ansi_term::Style::new();
-            foreground: self.fg.and_then(convert_color),
+        style.foreground = self.fg.and_then(convert_color);
-            background: self.bg.and_then(convert_color),
+        style.background = self.bg.and_then(convert_color);
-            is_bold: match_modifiers(&self, |m| m.contains(&Modifier::Bold)),
+        style.is_bold = match_modifiers(&self, |m| m.contains(&Modifier::Bold));
-            is_dimmed: match_modifiers(&self, |m| m.contains(&Modifier::Dim)),
+        style.is_dimmed = match_modifiers(&self, |m| m.contains(&Modifier::Dim));
-            is_italic: match_modifiers(&self, |m| m.contains(&Modifier::Italic)),
+        style.is_italic = match_modifiers(&self, |m| m.contains(&Modifier::Italic));
-            is_underline: match_modifiers(&self, |m| m.contains(&Modifier::Underlined)),
+        style.is_underline =
-            is_blink: match_modifiers(&self, |m| {
+            match_modifiers(&self, |m| m.contains(&Modifier::Underlined));
+        style.is_blink = match_modifiers(&self, |m| {
             m.contains(&Modifier::SlowBlink) || m.contains(&Modifier::RapidBlink)
-            }),
+        });
-            is_reverse: match_modifiers(&self, |m| m.contains(&Modifier::Reversed)),
+        style.is_reverse = match_modifiers(&self, |m| m.contains(&Modifier::Reversed));
-            is_hidden: match_modifiers(&self, |m| m.contains(&Modifier::Hidden)),
+        style.is_hidden = match_modifiers(&self, |m| m.contains(&Modifier::Hidden));
-            is_strikethrough: match_modifiers(&self, |m| {
+        style.is_strikethrough =
-                m.contains(&Modifier::CrossedOut)
+            match_modifiers(&self, |m| m.contains(&Modifier::CrossedOut));
-            }),
+        style
-        }
     }
 }
 
@@ -980,7 +980,7 @@ fn draw_input_buffer<B: Backend>(
         let width = layout_size.width.max(offset_width) - offset_width;
         let scroll = input.visual_scroll(width.into()) as u16;
 
-        let input_buf = Paragraph::new(Spans::from(vec![
+        let input_buf = Paragraph::new(Line::from(vec![
             Span::styled(
                 app.input.prompt.to_owned(),
                 app.config.general.prompt.style.to_owned().into(),
@@ -1121,7 +1121,7 @@ fn draw_sort_n_filter<B: Backend>(
         format!("({item_count}) ")
     };
 
-    let p = Paragraph::new(Spans::from(spans))
+    let p = Paragraph::new(Line::from(spans))
         .block(block(config, format!(" Sort & filter {item_count}")));
 
     f.render_widget(p, layout_size);