technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-11 22:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

deps: use newer version of terminal_size

Browse source
This commit is contained in:
iff 2024-12-10 15:16:32 +01:00
parent 8d7e21f99f
commit 0a4437f5b5
4 changed files with 22 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Cargo.lock generated
View file

@ -250,12 +250,6 @@ version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
[[package]]
name = "hermit-abi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]] [[package]]
name = "ignore" name = "ignore"
version = "0.4.23" version = "0.4.23"
@ -299,17 +293,6 @@ dependencies = [
"unicode-width", "unicode-width",
] ]
[[package]]
name = "io-lifetimes"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.11.0" version = "0.11.0"
@ -355,12 +338,6 @@ dependencies = [
"vcpkg", "vcpkg",
] ]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]] [[package]]
name = "linux-raw-sys" name = "linux-raw-sys"
version = "0.4.14" version = "0.4.14"
@ -489,6 +466,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sys-locale", "sys-locale",
"terminal_size",
"textwrap", "textwrap",
] ]
@ -664,20 +642,6 @@ dependencies = [
"triomphe", "triomphe",
] ]
[[package]]
name = "rustix"
version = "0.37.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
dependencies = [
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
"linux-raw-sys 0.3.8",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "rustix" name = "rustix"
version = "0.38.42" version = "0.38.42"
@ -687,7 +651,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys 0.4.14", "linux-raw-sys",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
@ -889,18 +853,18 @@ dependencies = [
"cfg-if", "cfg-if",
"fastrand", "fastrand",
"once_cell", "once_cell",
"rustix 0.38.42", "rustix",
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
name = "terminal_size" name = "terminal_size"
version = "0.2.6" version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
dependencies = [ dependencies = [
"rustix 0.37.27", "rustix",
"windows-sys 0.48.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]
@ -910,7 +874,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
dependencies = [ dependencies = [
"smawk", "smawk",
"terminal_size",
"unicode-linebreak", "unicode-linebreak",
"unicode-width", "unicode-width",
] ]

1
core/src/shell.rs
View file

@ -312,6 +312,7 @@ pub fn module_output(data: &Data, module: &str) -> Option<Vec<String>> {
.env("_PR_LAST_COMMAND", last_command) .env("_PR_LAST_COMMAND", last_command)
.env("_PR_ERROR_MSG", error_msg) .env("_PR_ERROR_MSG", error_msg)
.env("_PR_EXECUTABLES", executables) .env("_PR_EXECUTABLES", executables)
.stderr(std::process::Stdio::inherit())
.output() .output()
.expect("failed to execute process"); .expect("failed to execute process");

3
module-request-ai/Cargo.toml
View file

@ -15,7 +15,8 @@ sys-locale = "0.3"
rust-i18n = "3" rust-i18n = "3"
serde_json = { version = "1.0" } serde_json = { version = "1.0" }
serde = { version = "1.0", features = ["derive"]} serde = { version = "1.0", features = ["derive"]}
textwrap = { version = "0.16", features = ["terminal_size"] } textwrap = "0.16"
terminal_size = "0.4"
curl = { version = "0.4", optional = true } curl = { version = "0.4", optional = true }

14
module-request-ai/src/main.rs
View file

@ -1,6 +1,6 @@
use crate::requests::ai_suggestion; use crate::requests::ai_suggestion;
use colored::Colorize; use colored::Colorize;
use textwrap::{fill, termwidth}; use textwrap::fill;
mod requests; mod requests;
#[macro_use] #[macro_use]
@ -28,9 +28,19 @@ fn main() -> Result<(), std::io::Error> {
let warn = format!("{}:", t!("ai-suggestion")).bold().blue(); let warn = format!("{}:", t!("ai-suggestion")).bold().blue();
let note = fill(&suggest.note, termwidth()); let note = fill(&suggest.note, termwidth());
eprintln!("{}\n{}", warn, note); eprintln!("{}\n{}\n", warn, note);
let command = suggest.command; let command = suggest.command;
print!("{}<_PR_BR>", command); print!("{}<_PR_BR>", command);
} }
Ok(()) Ok(())
} }
fn termwidth() -> usize {
use terminal_size::{terminal_size, Height, Width};
let size = terminal_size();
if let Some((Width(w), Height(_))) = size {
std::cmp::min(w as usize, 80)
} else {
80
}
}