Skip to content

Commit 84f8295

Browse files
committed
version 3.5.0
1 parent 604edb7 commit 84f8295

File tree

7 files changed

+29
-15
lines changed

7 files changed

+29
-15
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
### next
1+
<a name="v3.5.0"></a>
2+
### v3.5.0 - 2025/12/02
23
- Windows: detect storage spaces - Thanks @mokurin000 and @acieslewicz
4+
- silently handle broken pipe on printing to stdout - Fix #104
5+
- don't print a TTY Reset when called with `--color no` or piped to a non TTY stream - Fix #105
36

47
<a name="v3.4.0"></a>
58
### v3.4.0 - 2025/11/08

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dysk"
3-
version = "3.4.0"
3+
version = "3.5.0"
44
authors = ["dystroy <[email protected]>"]
55
edition = "2018"
66
keywords = ["linux", "mac", "filesystem", "disk"]
@@ -11,19 +11,19 @@ repository = "https://github.com/Canop/dysk"
1111
homepage = "https://dystroy.org/dysk"
1212
documentation = "https://dystroy.org/dysk"
1313
readme = "README.md"
14-
rust-version = "1.70"
14+
rust-version = "1.75"
1515
exclude = ["website", "dysk*.zip"]
1616
build = "build.rs"
17-
resolver = "1"
17+
resolver = "2"
1818

1919
[dependencies]
20-
dysk-cli = { version = "3.4.0", path = "cli" } # beware: version is also in build dependencies
20+
dysk-cli = { version = "3.5.0", path = "cli" } # beware: version is also in build dependencies
2121

2222
[build-dependencies]
2323
clap = { version = "4.4", features = ["derive", "cargo"] }
2424
clap_complete = "4.4"
2525
clap_mangen = "0.2.12"
26-
dysk-cli = { version = "3.4.0", path = "cli" }
26+
dysk-cli = { version = "3.5.0", path = "cli" }
2727
serde = { version = "1.0", features = ["derive"] }
2828
toml = "0.7"
2929

bacon.toml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ default_job = "check"
66
[jobs]
77

88
[jobs.check]
9-
command = ["cargo", "check", "--all-targets", "--color", "always"]
9+
command = ["cargo", "check", "--all-targets"]
10+
need_stdout = false
11+
watch = ["tests", "benches", "examples"]
12+
13+
# A task dedicated to checking cargo can be compiled with the MSRV
14+
[jobs.check-msrv]
15+
command = [
16+
"cargo",
17+
"+1.75", # adjust depending on the MSRV
18+
"check",
19+
"--all-targets",
20+
]
1021
need_stdout = false
1122
watch = ["tests", "benches", "examples"]
1223

@@ -67,3 +78,4 @@ c = "job:clippy"
6778
d = "job:doc-open"
6879
t = "job:test"
6980
r = "job:run"
81+
v = "job:check-msrv"

build.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fn build_man_page() -> std::io::Result<()> {
5656
/// Check that all dysk versions are the same
5757
///
5858
/// See <https://github.com/Canop/dysk/issues/65>
59-
fn check_version_consistency() -> std::io::Result<()> {
59+
fn check_version_consistency() {
6060
#[derive(Deserialize)]
6161
struct Package {
6262
version: String,
@@ -87,7 +87,7 @@ fn check_version_consistency() -> std::io::Result<()> {
8787
let Ok(s) = fs::read_to_string("cli/Cargo.toml") else {
8888
// won't be visible unless run with -vv
8989
eprintln!("No local cli/Cargo.toml -- Assuming a cargo publish compilation");
90-
return Ok(());
90+
return;
9191
};
9292
let cli_cargo: CliCargo = toml::from_str(&s).unwrap();
9393
let ok = (version == main_cargo.package.version)
@@ -99,11 +99,10 @@ fn check_version_consistency() -> std::io::Result<()> {
9999
} else {
100100
panic!("VERSION MISMATCH - All dysk and dysk-cli versions must be the same");
101101
}
102-
Ok(())
103102
}
104103

105104
fn main() -> std::io::Result<()> {
106-
check_version_consistency()?;
105+
check_version_consistency();
107106
build_completion_scripts();
108107
build_man_page()?;
109108
Ok(())

cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dysk-cli"
3-
version = "3.4.0"
3+
version = "3.5.0"
44
authors = ["dystroy <[email protected]>"]
55
edition = "2021"
66
license = "MIT"

cli/src/normal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn is_normal(m: &Mount) -> bool {
1515
|| m.info.fs_type == "zfs" // unless it's zfs - see https://github.com/Canop/dysk/issues/32
1616
|| m.is_remote()
1717
)
18-
&& m.disk.as_ref().is_none_or(|d| !d.image) // not real
18+
&& m.disk.as_ref().map_or(true, |d| !d.image) // not real
1919
&& !m.info.bound // removing bound mounts
2020
&& m.info.fs_type != "squashfs" // quite ad-hoc...
2121
&& !is_system_path(&m.info.mount_point)

0 commit comments

Comments
 (0)