Skip to content

Commit 11a9d9d

Browse files
joshstoik1joshstoik1
committed
release: 0.4.3
2 parents 4a34f76 + 4bc0ae7 commit 11a9d9d

File tree

16 files changed

+94
-74
lines changed

16 files changed

+94
-74
lines changed

‎CREDITS.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,70 @@
11
# Project Dependencies
22
Package: riprip
3-
Version: 0.4.2
3+
Version: 0.4.3
44
Target: x86_64-unknown-linux-gnu
5-
Generated: 2025-05-16 05:18:29 UTC
5+
Generated: 2025-06-28 03:45:50 UTC
66

77
| Package | Version | Author(s) | License |
88
| ---- | ---- | ---- | ---- |
9-
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.12.3 | [Josh Stoik](mailto:[email protected]) | WTFPL |
10-
| [bindgen](https://github.com/rust-lang/rust-bindgen) ⚒️ | 0.71.1 | [Jyun-Yan You](mailto:[email protected]), [Emilio Cobos Álvarez](mailto:[email protected]), [Nick Fitzgerald](mailto:[email protected]), and The Servo project developers | BSD-3-Clause |
9+
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.13.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
10+
| [bindgen](https://github.com/rust-lang/rust-bindgen) ⚒️ | 0.72.0 | [Jyun-Yan You](mailto:[email protected]), [Emilio Cobos Álvarez](mailto:[email protected]), [Nick Fitzgerald](mailto:[email protected]), and The Servo project developers | BSD-3-Clause |
1111
| [bitflags](https://github.com/bitflags/bitflags) | 2.9.1 | The Rust Project Developers | MIT OR Apache-2.0 |
1212
| [block-buffer](https://github.com/RustCrypto/utils) | 0.10.4 | RustCrypto Developers | MIT OR Apache-2.0 |
1313
| [byteorder](https://github.com/BurntSushi/byteorder) | 1.5.0 | [Andrew Gallant](mailto:[email protected]) | Unlicense OR MIT |
14-
| [**cdtoc**](https://github.com/Blobfolio/cdtoc) | 0.9.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
14+
| [**cdtoc**](https://github.com/Blobfolio/cdtoc) | 0.11.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
1515
| [cexpr](https://github.com/jethrogb/rust-cexpr) ⚒️ | 0.6.0 | [Jethro Beekman](mailto:[email protected]) | Apache-2.0 OR MIT |
16-
| [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
16+
| [cfg-if](https://github.com/rust-lang/cfg-if) | 1.0.1 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
1717
| [clang-sys](https://github.com/KyleMayes/clang-sys) ⚒️ | 1.8.1 | [Kyle Mayes](mailto:[email protected]) | Apache-2.0 |
1818
| [cpufeatures](https://github.com/RustCrypto/utils) | 0.2.17 | RustCrypto Developers | MIT OR Apache-2.0 |
1919
| [**crc32fast**](https://github.com/srijs/rust-crc32fast) | 1.4.2 | [Sam Rijs](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
2020
| [crypto-common](https://github.com/RustCrypto/traits) | 0.1.6 | RustCrypto Developers | MIT OR Apache-2.0 |
21-
| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.10.2 | [Josh Stoik](mailto:[email protected]) | WTFPL |
21+
| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.13.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
2222
| [digest](https://github.com/RustCrypto/traits) | 0.10.7 | RustCrypto Developers | MIT OR Apache-2.0 |
2323
| [either](https://github.com/rayon-rs/either) ⚒️ | 1.15.0 | bluss | MIT OR Apache-2.0 |
2424
| [faster-hex](https://github.com/NervosFoundation/faster-hex) | 0.10.0 | [zhangsoledad](mailto:[email protected]) | MIT |
2525
| [fastrand](https://github.com/smol-rs/fastrand) | 2.3.0 | [Stjepan Glavina](mailto:[email protected]) | Apache-2.0 OR MIT |
26-
| [**fyi_ansi**](https://github.com/Blobfolio/fyi) | 2.1.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
27-
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.1.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
26+
| [fyi_ansi](https://github.com/Blobfolio/fyi) | 2.2.1 | [Josh Stoik](mailto:[email protected]) | WTFPL |
27+
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 2.3.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
2828
| [generic-array](https://github.com/fizyk20/generic-array.git) | 0.14.7 | [Bartłomiej Kamiński](mailto:[email protected]) and [Aaron Trent](mailto:[email protected]) | MIT |
2929
| [getrandom](https://github.com/rust-random/getrandom) | 0.3.3 | The Rand Project Developers | MIT OR Apache-2.0 |
3030
| [glob](https://github.com/rust-lang/glob) ⚒️ | 0.3.2 | The Rust Project Developers | MIT OR Apache-2.0 |
3131
| [hash32](https://github.com/japaric/hash32) | 0.3.1 | [Jorge Aparicio](mailto:[email protected]) | MIT OR Apache-2.0 |
3232
| [heapless](https://github.com/rust-embedded/heapless) | 0.8.0 | [Jorge Aparicio](mailto:[email protected]), [Per Lindgren](mailto:[email protected]), and [Emil Fresk](mailto:[email protected]) | MIT OR Apache-2.0 |
3333
| [itertools](https://github.com/rust-itertools/itertools) ⚒️ | 0.13.0 | bluss | MIT OR Apache-2.0 |
3434
| [itoa](https://github.com/dtolnay/itoa) | 1.0.15 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
35-
| [libc](https://github.com/rust-lang/libc) | 0.2.172 | The Rust Project Developers | MIT OR Apache-2.0 |
36-
| [**libcdio-sys**](https://github.com/MonterraByte/libcdio-sys) | 0.5.2 | [Joaquim Monteiro](mailto:[email protected]) | GPL-3.0+ |
37-
| [libloading](https://github.com/nagisa/rust_libloading/) ⚒️ | 0.8.7 | [Simonas Kazlauskas](mailto:[email protected]) | ISC |
35+
| [libc](https://github.com/rust-lang/libc) | 0.2.174 | The Rust Project Developers | MIT OR Apache-2.0 |
36+
| [**libcdio-sys**](https://github.com/MonterraByte/libcdio-sys) | 1.0.0 | [Joaquim Monteiro](mailto:[email protected]) | GPL-3.0+ |
37+
| [libloading](https://github.com/nagisa/rust_libloading/) ⚒️ | 0.8.8 | [Simonas Kazlauskas](mailto:[email protected]) | ISC |
3838
| [linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys) | 0.9.4 | [Dan Gohman](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
3939
| [log](https://github.com/rust-lang/log) | 0.4.27 | The Rust Project Developers | MIT OR Apache-2.0 |
40-
| [memchr](https://github.com/BurntSushi/memchr) ⚒️ | 2.7.4 | [Andrew Gallant](mailto:[email protected]) and bluss | Unlicense OR MIT |
40+
| [memchr](https://github.com/BurntSushi/memchr) ⚒️ | 2.7.5 | [Andrew Gallant](mailto:[email protected]) and bluss | Unlicense OR MIT |
4141
| [minimal-lexical](https://github.com/Alexhuszagh/minimal-lexical) ⚒️ | 0.2.1 | [Alex Huszagh](mailto:[email protected]) | MIT OR Apache-2.0 |
42-
| [**minreq**](https://github.com/neonmoe/minreq) | 2.13.4 | [Jens Pitkanen](mailto:[email protected]) | ISC |
42+
| [**minreq**](https://github.com/neonmoe/minreq) | 2.14.0 | [Jens Pitkanen](mailto:[email protected]) | ISC |
4343
| [nom](https://github.com/Geal/nom) ⚒️ | 7.1.3 | [email protected] | MIT |
4444
| [once_cell](https://github.com/matklad/once_cell) | 1.21.3 | [Aleksey Kladov](mailto:[email protected]) | MIT OR Apache-2.0 |
45-
| [**oxford_join**](https://github.com/Blobfolio/oxford_join) | 0.5.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
46-
| [prettyplease](https://github.com/dtolnay/prettyplease) ⚒️ | 0.2.32 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
45+
| [**oxford_join**](https://github.com/Blobfolio/oxford_join) | 0.7.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
46+
| [prettyplease](https://github.com/dtolnay/prettyplease) ⚒️ | 0.2.35 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
4747
| [proc-macro2](https://github.com/dtolnay/proc-macro2) ⚒️ | 1.0.95 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
4848
| [quote](https://github.com/dtolnay/quote) ⚒️ | 1.0.40 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
4949
| [regex](https://github.com/rust-lang/regex) ⚒️ | 1.11.1 | The Rust Project Developers and [Andrew Gallant](mailto:[email protected]) | MIT OR Apache-2.0 |
5050
| [regex-automata](https://github.com/rust-lang/regex/tree/master/regex-automata) ⚒️ | 0.4.9 | The Rust Project Developers and [Andrew Gallant](mailto:[email protected]) | MIT OR Apache-2.0 |
5151
| [regex-syntax](https://github.com/rust-lang/regex/tree/master/regex-syntax) ⚒️ | 0.8.5 | The Rust Project Developers and [Andrew Gallant](mailto:[email protected]) | MIT OR Apache-2.0 |
52-
| [**riprip_core**](https://github.com/Blobfolio/riprip) | 0.4.2 | [Josh Stoik](mailto:[email protected]) | WTFPL |
52+
| [**riprip_core**](https://github.com/Blobfolio/riprip) | 0.4.3 | [Josh Stoik](mailto:[email protected]) | WTFPL |
5353
| [rustc-hash](https://github.com/rust-lang/rustc-hash) ⚒️ | 2.1.1 | The Rust Project Developers | Apache-2.0 OR MIT |
5454
| [rustix](https://github.com/bytecodealliance/rustix) | 1.0.7 | [Dan Gohman](mailto:[email protected]) and [Jakub Konka](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
5555
| [sha1](https://github.com/RustCrypto/hashes) | 0.10.6 | RustCrypto Developers | MIT OR Apache-2.0 |
5656
| [shlex](https://github.com/comex/rust-shlex) ⚒️ | 1.3.0 | [comex](mailto:[email protected]), [Fenhl](mailto:[email protected]), [Adrian Taylor](mailto:[email protected]), [Alex Touchet](mailto:[email protected]), [Daniel Parks](mailto:dp+[email protected]), and [Garrett Berg](mailto:[email protected]) | MIT OR Apache-2.0 |
5757
| [signal-hook](https://github.com/vorner/signal-hook) | 0.3.18 | [Michal 'vorner' Vaner](mailto:[email protected]) and [Thomas Himmelstoss](mailto:[email protected]) | Apache-2.0 OR MIT |
5858
| [signal-hook-registry](https://github.com/vorner/signal-hook) | 1.4.5 | [Michal 'vorner' Vaner](mailto:[email protected]) and [Masaki Hara](mailto:[email protected]) | Apache-2.0 OR MIT |
5959
| [stable_deref_trait](https://github.com/storyyeller/stable_deref_trait) | 1.2.0 | [Robert Grosse](mailto:[email protected]) | MIT OR Apache-2.0 |
60-
| [syn](https://github.com/dtolnay/syn) ⚒️ | 2.0.101 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
60+
| [syn](https://github.com/dtolnay/syn) ⚒️ | 2.0.104 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
6161
| [**tempfile**](https://github.com/Stebalien/tempfile) | 3.20.0 | [Steven Allen](mailto:[email protected]), The Rust Project Developers, [Ashley Mannix](mailto:[email protected]), and [Jason White](mailto:[email protected]) | MIT OR Apache-2.0 |
6262
| [terminal_size](https://github.com/eminence/terminal-size) | 0.4.2 | [Andrew Chin](mailto:[email protected]) | MIT OR Apache-2.0 |
63-
| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.7.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
63+
| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.9.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
6464
| [typenum](https://github.com/paholg/typenum) | 1.18.0 | [Paho Lurie-Gregg](mailto:[email protected]) and [Andre Bogus](mailto:[email protected]) | MIT OR Apache-2.0 |
6565
| [unicode-ident](https://github.com/dtolnay/unicode-ident) ⚒️ | 1.0.18 | [David Tolnay](mailto:[email protected]) | (MIT OR Apache-2.0) AND Unicode-3.0 |
66-
| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.0 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | MIT OR Apache-2.0 |
67-
| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.13.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
66+
| [unicode-width](https://github.com/unicode-rs/unicode-width) | 0.2.1 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | MIT OR Apache-2.0 |
67+
| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.15.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
6868
| [version_check](https://github.com/SergioBenitez/version_check) ⚒️ | 0.9.5 | [Sergio Benitez](mailto:[email protected]) | MIT OR Apache-2.0 |
6969

7070
### Legend

‎release/man/riprip.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.TH "RIP RIP HOORAY!" "1" "May 2025" "riprip v0.4.2" "User Commands"
1+
.TH "RIP RIP HOORAY!" "1" "June 2025" "riprip v0.4.3" "User Commands"
22
.SH NAME
3-
RIP RIP HOORAY! \- Manual page for riprip v0.4.2.
3+
RIP RIP HOORAY! \- Manual page for riprip v0.4.3.
44
.SH DESCRIPTION
55
A specialized audio CD\-ripper optimized for incremental data recovery.
66
.SS USAGE:

‎riprip/Cargo.toml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "riprip"
3-
version = "0.4.2"
3+
version = "0.4.3"
44
license = "WTFPL"
55
authors = ["Josh Stoik <[email protected]>"]
66
edition = "2024"
@@ -126,17 +126,16 @@ description = "Rip one or more specific tracks (rather than the whole disc). Mul
126126
duplicate = true
127127

128128
[build-dependencies]
129-
argyle = "0.12.*"
129+
argyle = "0.13.*"
130130

131131
[dependencies]
132-
argyle = "0.12.*"
133-
dactyl = "0.10.*"
134-
fyi_ansi = "2.1.*"
135-
oxford_join = "0.5.*"
136-
utc2k = "0.13.*"
132+
argyle = "0.13.*"
133+
dactyl = "0.13.*"
134+
oxford_join = "0.7.*"
135+
utc2k = "0.15.*"
137136

138137
[dependencies.fyi_msg]
139-
version = "2.1.*"
138+
version = "2.3.*"
140139
features = [ "signals" ]
141140

142141
[dependencies.riprip_core]

‎riprip/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::path::PathBuf;
88

99

1010
/// # Set Up CLI Arguments.
11-
pub fn main() {
11+
fn main() {
1212
println!("cargo:rerun-if-env-changed=CARGO_PKG_VERSION");
1313

1414
let mut builder = KeyWordsBuilder::default();

‎riprip/src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
mod cli;
5959

6060
use dactyl::NiceU16;
61-
use fyi_ansi::{
62-
ansi,
63-
csi,
64-
dim,
65-
bold,
66-
};
6761
use fyi_msg::{
62+
fyi_ansi::{
63+
ansi,
64+
csi,
65+
dim,
66+
bold,
67+
},
6868
Msg,
6969
Progless,
7070
};

‎riprip_core/Cargo.toml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "riprip_core"
3-
version = "0.4.2"
3+
version = "0.4.3"
44
license = "WTFPL"
55
authors = ["Josh Stoik <[email protected]>"]
66
edition = "2024"
@@ -10,46 +10,43 @@ readme = "README.md"
1010
publish = false
1111

1212
[dependencies]
13-
cdtoc = "0.9.*"
13+
cdtoc = "0.11.*"
1414
crc32fast = "=1.4.2"
15-
dactyl = "0.10.*"
16-
fyi_ansi = "2.1.*"
17-
oxford_join = "0.5.*"
15+
dactyl = "0.13.*"
16+
oxford_join = "0.7.*"
1817
tempfile = "3.8.0"
19-
trimothy = "0.7.*"
20-
utc2k = "0.13.*"
18+
trimothy = "0.9.*"
19+
utc2k = "0.15.*"
2120

2221
[dependencies.fyi_msg]
23-
version = "2.1.*"
22+
version = "2.3.*"
2423
features = [ "signals" ]
2524

2625
[dependencies.libcdio-sys]
27-
version = "=0.5.2"
26+
version = "=1.0.0"
2827
default-features = false
29-
features = [ "cdio" ]
3028

3129
[dependencies.minreq]
32-
version = "2.13.*"
30+
version = "2.14.*"
3331
default-features = false
3432
# Neither AccurateRip nor CTDB use SSL for whatever
3533
# reason so we don't need any minreq features at all!
3634

3735
[build-dependencies]
38-
dactyl = "0.10.*"
39-
oxford_join = "0.5.*"
36+
dactyl = "0.13.*"
37+
oxford_join = "0.7.*"
4038

4139
[build-dependencies.cdtoc]
42-
version = "0.9.*"
40+
version = "0.11.*"
4341
default-features = false
4442
features = [ "accuraterip" ]
4543

4644
[build-dependencies.libcdio-sys]
47-
version = "=0.5.2"
45+
version = "=1.0.0"
4846
default-features = false
49-
features = [ "cdio" ]
5047

5148
[build-dependencies.minreq]
52-
version = "2.13.*"
49+
version = "2.14.*"
5350
default-features = false
5451

5552
[dev-dependencies]

‎riprip_core/build.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ array that can be easily searched at runtime.
66
*/
77

88
use cdtoc::AccurateRip;
9-
use dactyl::NiceU16;
9+
use dactyl::{
10+
NiceSeparator,
11+
NiceU16,
12+
};
1013
use oxford_join::JoinFmt;
1114
use std::{
1215
collections::BTreeMap,
@@ -142,7 +145,7 @@ fn nice_caches(parsed: BTreeMap<VendorModel, u16>) -> String {
142145
f,
143146
"(DriveVendorModel({:?}), {}_u16)",
144147
self.0,
145-
NiceU16::with_separator(self.1, b'_'),
148+
NiceU16::with_separator(self.1, NiceSeparator::Underscore),
146149
)
147150
}
148151
}

‎riprip_core/src/cdio.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ impl LibcdioInstance {
388388
// The return code is a bool, true for good, instead of the usual
389389
// 0 FFI normally kicks back.
390390
// Safety: this is an FFI call…
391-
if LIBCDIO_TRUE == unsafe { libcdio_sys::cdio_get_hwinfo(self.as_ptr(), &mut raw) } {
391+
if LIBCDIO_TRUE == unsafe { libcdio_sys::cdio_get_hwinfo(self.as_ptr(), &raw mut raw) } {
392392
// Rather than deal with the uncertainty of pointers, let's recast
393393
// the signs since we have everything right here.
394394
let vendor_u8 = raw.psz_vendor.map(u8::saturating_from);
@@ -556,7 +556,7 @@ impl LibcdioInstance {
556556
f: buf[usize::from(CD_DATA_SIZE) + 9],
557557
};
558558
// Safety: this is an FFI call…
559-
if lsn != unsafe { libcdio_sys::cdio_msf_to_lsn(&msf) } {
559+
if lsn != unsafe { libcdio_sys::cdio_msf_to_lsn(&raw const msf) } {
560560
return Err(RipRipError::SubchannelDesync);
561561
}
562562
}

‎riprip_core/src/disc.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ use crate::{
2121
SavedRips,
2222
};
2323
use dactyl::NoHash;
24-
use fyi_ansi::{
25-
ansi,
26-
csi,
27-
dim,
24+
use fyi_msg::{
25+
fyi_ansi::{
26+
ansi,
27+
csi,
28+
dim,
29+
},
30+
Progless,
2831
};
29-
use fyi_msg::Progless;
3032
use std::{
3133
borrow::Cow,
3234
collections::HashMap,

‎riprip_core/src/error.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
*/
44

55
use cdtoc::TocError;
6-
use fyi_ansi::{
7-
ansi,
8-
csi,
6+
use fyi_msg::{
7+
fyi_ansi::{
8+
ansi,
9+
csi,
10+
},
11+
Msg,
912
};
10-
use fyi_msg::Msg;
1113
use std::{
1214
error::Error,
1315
fmt,

0 commit comments

Comments
 (0)