Skip to content

Commit

Permalink
release: 0.15.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshstoik1
joshstoik1 committed Nov 28, 2024
2 parents f6f9358 + eeb20a6 commit 7b2c927
Show file tree
Hide file tree
Showing 10 changed files with 184 additions and 150 deletions.
54 changes: 27 additions & 27 deletions CREDITS.md
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Project Dependencies
Package: adbyss
Version: 0.15.0
Version: 0.15.1
Target: x86_64-unknown-linux-gnu
Generated: 2024-11-11 18:26:04 UTC
Generated: 2024-11-28 19:57:47 UTC

| Package | Version | Author(s) | License |
| ---- | ---- | ---- | ---- |
| [**adbyss_psl**](https://github.com/Blobfolio/adbyss) | 0.15.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [**adbyss_psl**](https://github.com/Blobfolio/adbyss) | 0.15.1 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [aho-corasick](https://github.com/BurntSushi/aho-corasick) | 1.1.3 | [Andrew Gallant](mailto:[email protected]) | Unlicense OR MIT |
| [anyhow](https://github.com/dtolnay/anyhow) | 1.0.93 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.10.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
| [**argyle**](https://github.com/Blobfolio/argyle) | 0.10.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
| [bitflags](https://github.com/bitflags/bitflags) | 2.6.0 | The Rust Project Developers | MIT OR Apache-2.0 |
| [cc](https://github.com/rust-lang/cc-rs) ⚒️ | 1.1.37 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
| [cc](https://github.com/rust-lang/cc-rs) ⚒️ | 1.2.1 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
| [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.7.4 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
| [**dactyl**](https://github.com/Blobfolio/dactyl) | 0.8.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
| [displaydoc](https://github.com/yaahc/displaydoc) | 0.2.5 | [Jane Lusby](mailto:[email protected]) | MIT OR Apache-2.0 |
| [equivalent](https://github.com/cuviper/equivalent) | 1.0.1 | | Apache-2.0 OR MIT |
| [fastrand](https://github.com/smol-rs/fastrand) | 2.2.0 | [Stjepan Glavina](mailto:[email protected]) | Apache-2.0 OR MIT |
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 1.2.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [**fyi_msg**](https://github.com/Blobfolio/fyi) | 1.3.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [getrandom](https://github.com/rust-random/getrandom) | 0.2.15 | The Rand Project Developers | MIT OR Apache-2.0 |
| [hashbrown](https://github.com/rust-lang/hashbrown) | 0.15.1 | [Amanieu d'Antras](mailto:[email protected]) | MIT OR Apache-2.0 |
| [hashbrown](https://github.com/rust-lang/hashbrown) | 0.15.2 | [Amanieu d'Antras](mailto:[email protected]) | MIT OR Apache-2.0 |
| [icu_collections](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
| [icu_locid](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
| [icu_locid_transform](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
Expand All @@ -30,56 +30,56 @@
| [icu_properties_data](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
| [icu_provider](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
| [icu_provider_macros](https://github.com/unicode-org/icu4x) | 1.5.0 | The ICU4X Project Developers | Unicode-3.0 |
| [idna](https://github.com/servo/rust-url/) | 1.0.3 | The rust-url developers | MIT OR Apache-2.0 |
| [**idna**](https://github.com/servo/rust-url/) | 1.0.3 | The rust-url developers | MIT OR Apache-2.0 |
| [idna_adapter](https://github.com/hsivonen/idna_adapter) | 1.2.0 | The rust-url developers | Apache-2.0 OR MIT |
| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.6.0 | | Apache-2.0 OR MIT |
| [itoa](https://github.com/dtolnay/itoa) | 1.0.11 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**libc**](https://github.com/rust-lang/libc) | 0.2.162 | The Rust Project Developers | MIT OR Apache-2.0 |
| [itoa](https://github.com/dtolnay/itoa) | 1.0.14 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**libc**](https://github.com/rust-lang/libc) | 0.2.166 | The Rust Project Developers | MIT OR Apache-2.0 |
| [libyml](https://github.com/sebastienrousseau/libyml) | 0.0.5 | LibYML Contributors | MIT |
| [linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys) | 0.4.14 | [Dan Gohman](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
| [litemap](https://github.com/unicode-org/icu4x) | 0.7.3 | The ICU4X Project Developers | Unicode-3.0 |
| [litemap](https://github.com/unicode-org/icu4x) | 0.7.4 | The ICU4X Project Developers | Unicode-3.0 |
| [log](https://github.com/rust-lang/log) | 0.4.22 | The Rust Project Developers | MIT OR Apache-2.0 |
| [memchr](https://github.com/BurntSushi/memchr) | 2.7.4 | [Andrew Gallant](mailto:[email protected]) and bluss | Unlicense OR MIT |
| [**minreq**](https://github.com/neonmoe/minreq) | 2.12.0 | [Jens Pitkanen](mailto:[email protected]) | ISC |
| [once_cell](https://github.com/matklad/once_cell) | 1.20.2 | [Aleksey Kladov](mailto:[email protected]) | MIT OR Apache-2.0 |
| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.89 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
| [proc-macro2](https://github.com/dtolnay/proc-macro2) | 1.0.92 | [David Tolnay](mailto:[email protected]) and [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 |
| [quote](https://github.com/dtolnay/quote) | 1.0.37 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**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 |
| [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 |
| [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 |
| [ring](https://github.com/briansmith/ring) | 0.17.8 | [Brian Smith](mailto:[email protected]) | |
| [rustix](https://github.com/bytecodealliance/rustix) | 0.38.40 | [Dan Gohman](mailto:[email protected]) and [Jakub Konka](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
| [rustix](https://github.com/bytecodealliance/rustix) | 0.38.41 | [Dan Gohman](mailto:[email protected]) and [Jakub Konka](mailto:[email protected]) | Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT |
| [rustls](https://github.com/rustls/rustls) | 0.21.12 | | Apache-2.0 OR ISC OR MIT |
| [rustls-webpki](https://github.com/rustls/webpki) | 0.101.7 | | ISC |
| [ryu](https://github.com/dtolnay/ryu) | 1.0.18 | [David Tolnay](mailto:[email protected]) | Apache-2.0 OR BSL-1.0 |
| [sct](https://github.com/rustls/sct.rs) | 0.7.1 | [Joseph Birr-Pixton](mailto:[email protected]) | Apache-2.0 OR ISC OR MIT |
| [**serde**](https://github.com/serde-rs/serde) | 1.0.214 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [serde_derive](https://github.com/serde-rs/serde) | 1.0.214 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [serde_json](https://github.com/serde-rs/json) ⚒️ | 1.0.132 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**serde**](https://github.com/serde-rs/serde) | 1.0.215 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [serde_derive](https://github.com/serde-rs/serde) | 1.0.215 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**serde_json**](https://github.com/serde-rs/json) ⚒️ | 1.0.133 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [**serde_yml**](https://github.com/sebastienrousseau/serde_yml) | 0.0.12 | Serde YML Contributors | MIT OR Apache-2.0 |
| [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 |
| [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 |
| [smallvec](https://github.com/servo/rust-smallvec) | 1.13.2 | The Servo Project Developers | MIT OR Apache-2.0 |
| [spin](https://github.com/mvdnes/spin-rs.git) | 0.9.8 | [Mathijs van de Nes](mailto:[email protected]), [John Ericson](mailto:[email protected]), and [Joshua Barretto](mailto:[email protected]) | MIT |
| [stable_deref_trait](https://github.com/storyyeller/stable_deref_trait) | 1.2.0 | [Robert Grosse](mailto:[email protected]) | MIT OR Apache-2.0 |
| [syn](https://github.com/dtolnay/syn) | 2.0.87 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [syn](https://github.com/dtolnay/syn) | 2.0.89 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 |
| [synstructure](https://github.com/mystor/synstructure) | 0.13.1 | [Nika Layzell](mailto:[email protected]) | MIT |
| [tempfile](https://github.com/Stebalien/tempfile) | 3.14.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 |
| [tinystr](https://github.com/unicode-org/icu4x) | 0.7.6 | The ICU4X Project Developers | Unicode-3.0 |
| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.3.1 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.13 | [David Tolnay](mailto:[email protected]) | (MIT OR Apache-2.0) AND Unicode-DFS-2016 |
| [**trimothy**](https://github.com/Blobfolio/trimothy) | 0.6.0 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
| [unicode-ident](https://github.com/dtolnay/unicode-ident) | 1.0.14 | [David Tolnay](mailto:[email protected]) | (MIT OR Apache-2.0) AND Unicode-3.0 |
| [untrusted](https://github.com/briansmith/untrusted) | 0.9.0 | [Brian Smith](mailto:[email protected]) | ISC |
| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.11.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
| [**utc2k**](https://github.com/Blobfolio/utc2k) | 0.11.1 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
| [utf16_iter](https://github.com/hsivonen/utf16_iter) | 1.0.5 | [Henri Sivonen](mailto:[email protected]) | Apache-2.0 OR MIT |
| [utf8_iter](https://github.com/hsivonen/utf8_iter) | 1.0.4 | [Henri Sivonen](mailto:[email protected]) | Apache-2.0 OR MIT |
| [version_check](https://github.com/SergioBenitez/version_check) ⚒️ | 0.9.5 | [Sergio Benitez](mailto:[email protected]) | MIT OR Apache-2.0 |
| [webpki-roots](https://github.com/rustls/webpki-roots) | 0.25.4 | | MPL-2.0 |
| [write16](https://github.com/hsivonen/write16) | 1.0.0 | | Apache-2.0 OR MIT |
| [**write_atomic**](https://github.com/Blobfolio/write_atomic) | 0.5.1 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL |
| [**write_atomic**](https://github.com/Blobfolio/write_atomic) | 0.5.2 | [Josh Stoik](mailto:josh@blobfolio.com) | WTFPL |
| [writeable](https://github.com/unicode-org/icu4x) | 0.5.5 | The ICU4X Project Developers | Unicode-3.0 |
| [yoke](https://github.com/unicode-org/icu4x) | 0.7.4 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [yoke-derive](https://github.com/unicode-org/icu4x) | 0.7.4 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [zerofrom](https://github.com/unicode-org/icu4x) | 0.1.4 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [zerofrom-derive](https://github.com/unicode-org/icu4x) | 0.1.4 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [yoke](https://github.com/unicode-org/icu4x) | 0.7.5 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [yoke-derive](https://github.com/unicode-org/icu4x) | 0.7.5 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [zerofrom](https://github.com/unicode-org/icu4x) | 0.1.5 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [zerofrom-derive](https://github.com/unicode-org/icu4x) | 0.1.5 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |
| [zerovec](https://github.com/unicode-org/icu4x) | 0.10.4 | The ICU4X Project Developers | Unicode-3.0 |
| [zerovec-derive](https://github.com/unicode-org/icu4x) | 0.10.3 | [Manish Goregaokar](mailto:[email protected]) | Unicode-3.0 |

Expand Down
8 changes: 4 additions & 4 deletions adbyss/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adbyss"
version = "0.15.0"
version = "0.15.1"
license = "WTFPL"
authors = ["Josh Stoik <[email protected]>"]
edition = "2021"
Expand Down Expand Up @@ -90,12 +90,12 @@ items = [

[dependencies]
argyle = "0.10.*"
dactyl = "0.7.*"
fyi_msg = "1.2.*"
dactyl = "0.8.*"
fyi_msg = "1.3.*"
libc = "0.2.*"
regex = "1.11.*"
serde_yml = "=0.0.12"
trimothy = "0.3.*"
trimothy = "0.6.*"
utc2k = "0.11.*"
write_atomic = "0.5.*"

Expand Down
6 changes: 3 additions & 3 deletions adbyss/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const MAX_LINE: usize = 245;

/// Main.
fn main() {
match _main() {
match main__() {
Err(e @ (AdbyssError::PrintHelp | AdbyssError::PrintVersion)) => {
println!("{e}");
},
Expand All @@ -112,7 +112,7 @@ fn main() {

#[inline]
/// Actual Main.
fn _main() -> Result<(), AdbyssError> {
fn main__() -> Result<(), AdbyssError> {
// We need root!
require_root()?;

Expand Down Expand Up @@ -225,7 +225,7 @@ fn check_internet() -> Result<(), AdbyssError> {
.with_timeout(15)
.send();

if res.map_or(false, |r| r.status_code == 200) { return Ok(()); }
if res.is_ok_and(|r| r.status_code == 200) { return Ok(()); }

// Out of tries?
if tries == 9 { return Err(AdbyssError::NoInternet); }
Expand Down
4 changes: 2 additions & 2 deletions adbyss/src/settings.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ impl Settings {
if ! yes && ! fyi_msg::confirm!(yes: format!(
"Write {} hosts to {}?",
NiceU64::from(len),
self.hostfile.to_string_lossy(),
self.hostfile.display(),
)) {
return Err(AdbyssError::Aborted);
}
Expand All @@ -181,7 +181,7 @@ impl Settings {
// Prompt the user before taking any action.
if ! yes && ! fyi_msg::confirm!(yes: format!(
"Remove all Adbyss blackhole entries from {}?",
self.hostfile.to_string_lossy(),
self.hostfile.display(),
)) {
return Err(AdbyssError::Aborted);
}
Expand Down
3 changes: 2 additions & 1 deletion adbyss/src/write.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl Shitlist {
// Split into words. If the first is an IP, try the rest to see if
// they're prunable domains.
let mut words = line.split_ascii_whitespace();
if words.next().map_or(false, |w| w.parse::<IpAddr>().is_ok()) {
if words.next().is_some_and(|w| w.parse::<IpAddr>().is_ok()) {
for word in words.filter_map(Domain::new) {
if let Ok(pos) = set.binary_search(&word) { set.remove(pos); }
}
Expand Down Expand Up @@ -206,6 +206,7 @@ pub(super) fn read_hosts<P: AsRef<Path>>(src: P) -> Result<(String, bool), Adbys
}

// Look for stray end markers.
// TODO: use remove_matches once stable.
while let Some(end) = out.find(MARKER_END) {
any = true;
out.replace_range(end..end + len_end, "");
Expand Down
11 changes: 11 additions & 0 deletions adbyss_psl/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@



## [0.15.1](https://github.com/Blobfolio/adbyss/releases/tag/v0.15.1) - 2024-11-28

### Changed

* Bump `brunch` to `0.7` (dev)
* Bump `trimothy` to `0.6`
* Miscellaneous code cleanup and lints
* Update suffix database



## [0.15.0](https://github.com/Blobfolio/adbyss/releases/tag/v0.15.0) - 2024-11-11

### New
Expand Down
6 changes: 3 additions & 3 deletions adbyss_psl/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adbyss_psl"
version = "0.15.0"
version = "0.15.1"
license = "WTFPL"
authors = ["Josh Stoik <[email protected]>"]
edition = "2021"
Expand All @@ -22,13 +22,13 @@ idna = "1.0.0"
serde_json = "1.0.100"

[dev-dependencies]
brunch = "0.6.*"
brunch = "0.7.*"
serde = "1.0.*"
serde_json = "1.0.*"

[dependencies]
idna = "1.0.0"
trimothy = "0.3.*"
trimothy = "0.6.*"

[dependencies.serde]
version = "1.0.*"
Expand Down
Loading

0 comments on commit 7b2c927

Please sign in to comment.