Compare commits

..

3 Commits

Author SHA1 Message Date
andy.boot bdd85b9bf4 Revert "build: Attempt to add deb musl build."
This reverts commit 07be4261b9.
2026-01-08 22:41:34 +00:00
andy.boot 7a57cb97d7 Revert "build: attempt to add deb-latest to build"
This reverts commit 129e5abb54.
2026-01-08 22:41:23 +00:00
andy.boot 129e5abb54 build: attempt to add deb-latest to build 2026-01-08 22:32:01 +00:00
7 changed files with 10 additions and 17 deletions
+5
View File
@@ -126,6 +126,11 @@ jobs:
target: x86_64-unknown-linux-musl, target: x86_64-unknown-linux-musl,
use-cross: use-cross, use-cross: use-cross,
} }
- {
os: deb-latest,
target: x86_64-unknown-linux-musl,
use-cross: use-cross,
}
- { os: macos-latest, target: x86_64-apple-darwin } - { os: macos-latest, target: x86_64-apple-darwin }
- { os: windows-latest, target: i686-pc-windows-gnu } - { os: windows-latest, target: i686-pc-windows-gnu }
- { os: windows-latest, target: i686-pc-windows-msvc } - { os: windows-latest, target: i686-pc-windows-msvc }
Generated
+1 -1
View File
@@ -296,7 +296,7 @@ dependencies = [
[[package]] [[package]]
name = "du-dust" name = "du-dust"
version = "1.2.4" version = "1.2.3"
dependencies = [ dependencies = [
"assert_cmd", "assert_cmd",
"chrono", "chrono",
+1 -1
View File
@@ -1,7 +1,7 @@
[package] [package]
name = "du-dust" name = "du-dust"
description = "A more intuitive version of du" description = "A more intuitive version of du"
version = "1.2.4" version = "1.2.3"
authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"] authors = ["bootandy <bootandy@gmail.com>", "nebkor <code@ardent.nebcorp.com>"]
edition = "2024" edition = "2024"
readme = "README.md" readme = "README.md"
-3
View File
@@ -28,6 +28,3 @@ ignore-hidden=true
output-format="si" output-format="si"
number-of-lines=5 number-of-lines=5
# To keep the .git directory collapsed
collapse=[".git"]
+2 -2
View File
@@ -1,6 +1,6 @@
.ie \n(.g .ds Aq \(aq .ie \n(.g .ds Aq \(aq
.el .ds Aq ' .el .ds Aq '
.TH Dust 1 "Dust 1.2.4" .TH Dust 1 "Dust 1.2.3"
.SH NAME .SH NAME
Dust \- Like du but more intuitive Dust \- Like du but more intuitive
.SH SYNOPSIS .SH SYNOPSIS
@@ -170,4 +170,4 @@ Print version
[\fIPATH\fR] [\fIPATH\fR]
Input files or directories Input files or directories
.SH VERSION .SH VERSION
v1.2.4 v1.2.3
-9
View File
@@ -38,7 +38,6 @@ pub struct Config {
pub files0_from: Option<String>, pub files0_from: Option<String>,
pub number_of_lines: Option<usize>, pub number_of_lines: Option<usize>,
pub files_from: Option<String>, pub files_from: Option<String>,
pub collapse: Option<Vec<String>>,
} }
impl Config { impl Config {
@@ -178,14 +177,6 @@ impl Config {
pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> { pub fn get_changed_time_operator(&self, options: &Cli) -> Option<(Operator, i64)> {
get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds()) get_filter_time_operator(options.ctime.as_ref(), get_current_date_epoch_seconds())
} }
pub fn get_collapse(&self, options: &Cli) -> Option<Vec<String>> {
if self.collapse.is_none() {
options.collapse.clone()
} else {
self.collapse.clone()
}
}
} }
fn get_current_date_epoch_seconds() -> i64 { fn get_current_date_epoch_seconds() -> i64 {
+1 -1
View File
@@ -224,7 +224,7 @@ fn main() {
indicator.spawn(output_format.clone()) indicator.spawn(output_format.clone())
} }
let keep_collapsed: HashSet<PathBuf> = match config.get_collapse(&options) { let keep_collapsed: HashSet<PathBuf> = match options.collapse {
Some(ref collapse) => { Some(ref collapse) => {
let mut combined_dirs = HashSet::new(); let mut combined_dirs = HashSet::new();
for collapse_dir in collapse { for collapse_dir in collapse {