From c452d0a63f05fbeddcb2b01097ae4ba18692a677 Mon Sep 17 00:00:00 2001 From: Mikhail Katychev Date: Wed, 27 Mar 2024 12:01:33 -0500 Subject: [PATCH] updated upstream crates --- Cargo.toml | 49 ++++++++++++++++++++++----------------------- cli/Cargo.toml | 2 +- cli/src/lib.rs | 10 ++++----- filmreel/Cargo.toml | 2 +- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 002c90b..0604854 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,32 +15,31 @@ members = [ resolver = "2" [workspace.dependencies] -anyhow = "1.0.71" -argh = "0.1.10" -chrono = "0.4.26" -colored = "2.0.0" -colored-diff = "0.2.3" -colored_json = "2.1.0" -filmreel = { version = "0.7.0", path = "filmreel" } +anyhow = "1.0" +argh = "0.1" +chrono = "0.4" +colored = "2.1" +colored-diff = "0.2" +colored_json = "4.1" glob = "0.3.1" -http = "0.2.9" +http = "1.1.0" lazy_static = "1.4.0" -log = { version = "0.4.18", features = ["std"] } -mdcat = "0.30.3" +log = { version = "0.4", features = ["std"] } +mdcat = "2.1" +paste = "1" +pest = "2.7" +pest_derive = "2.7" +pretty_assertions = "1.4.0" +prettytable-rs = "0.10" +pulldown-cmark ="0.10" +regex = "1.8.3" +reqwest = { version = "0.12", features = ["blocking", "json"] } +rstest = "0.18" +serde = { version = "1.0", features = ["derive"] } +serde-hashkey = { version = "0.4", features = ["ordered-float"] } +serde_json = "1.0" +syntect = "5.2" +url = "2.5" +which = "6" # overflow broken for latest minus minus = { version = "3.4.0", features = ["static_output"] } -paste = "1.0.12" -pest = "2.6.0" -pest_derive = "2.6.0" -pretty_assertions = "0.7.2" -prettytable-rs = "0.10.0" -pulldown-cmark ="0.9.3" -regex = "1.8.3" -reqwest = { version = "0.11.18", features = ["blocking", "json"] } -rstest = "0.16.0" -serde = { version = "1.0.163", features = ["derive"] } -serde-hashkey = { version = "0.4.5", features = ["ordered-float"] } -serde_json = "1.0.96" -syntect = "5.0.0" -url = "2.3.1" -which = "4.4.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 02e9a10..f8a12a0 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -33,7 +33,7 @@ filmreel.path = "../filmreel" mdcat = { workspace = true, optional = true } syntect = { workspace = true, optional = true } -pulldown-cmark = { version = "0.9.3", optional = true } +pulldown-cmark = { workspace = true, optional = true } # overflow broken for latest minus minus = { workspace = true, optional = true } diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 48d9971..85eb041 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -2,7 +2,7 @@ use crate::params::BaseParams; use anyhow::{anyhow, Error}; use argh::FromArgs; // >:( Colour -use colored_json::{prelude::*, Color as Colour, Styler}; +use colored_json::{prelude::*, Color as Colour, Style, Styler}; use serde::Serialize; use std::{fs, path::PathBuf}; @@ -357,10 +357,10 @@ impl VirtualRecord { /// get_styler returns the custom syntax values for stdout json fn get_styler() -> Styler { Styler { - bool_value: Colour::Purple.normal(), - float_value: Colour::RGB(255, 123, 0).normal(), - integer_value: Colour::RGB(255, 123, 0).normal(), - nil_value: Colour::Cyan.normal(), + bool_value: Style::new(Colour::Magenta), + float_value: Style::new(Colour::RGB(255, 123, 0)), + integer_value: Style::new(Colour::RGB(255, 123, 0)), + nil_value: Style::new(Colour::Cyan), string_include_quotation: false, ..Default::default() } diff --git a/filmreel/Cargo.toml b/filmreel/Cargo.toml index bd9286f..85f2d89 100644 --- a/filmreel/Cargo.toml +++ b/filmreel/Cargo.toml @@ -25,7 +25,7 @@ serde.workspace = true serde_json.workspace = true serde-hashkey.workspace = true -jql = { version = "3.3.0", optional = true } +jql = { version = "5.2.0", optional = true } [features] default = []