release: 0.21.0

Author: joshstoik1

README.md

@@ -27,8 +27,8 @@ cargo install \
 
 # Optional: download/save the advanced settings template so you can make
 # changes if/as needed.
-wget -qO- https://raw.githubusercontent.com/Blobfolio/adbyss/refs/heads/master/adbyss/skel/adbyss.yaml | \
-    sudo tee /etc/adbyss.yaml >/dev/null
+wget -qO- https://raw.githubusercontent.com/Blobfolio/adbyss/refs/heads/master/adbyss/skel/adbyss.toml | \
+    sudo tee /etc/adbyss.toml >/dev/null
 ```
 
 
@@ -37,7 +37,7 @@ wget -qO- https://raw.githubusercontent.com/Blobfolio/adbyss/refs/heads/master/a
 
 It's easy.
 
-Advanced settings are stored in `/etc/adbyss.yaml`. Just grab, edit, and save the [default config](https://raw.githubusercontent.com/Blobfolio/adbyss/refs/heads/master/adbyss/skel/adbyss.yaml) to that location if you want to change anything.
+Advanced settings are stored in `/etc/adbyss.toml`. Just grab, edit, and save the [default config](https://raw.githubusercontent.com/Blobfolio/adbyss/refs/heads/master/adbyss/skel/adbyss.toml) to that location if you want to change anything.
 
 Otherwise, just run `sudo adbyss [FLAGS] [OPTIONS]`.
 
@@ -57,9 +57,9 @@ And the following option is available:
 
 | Short | Long | Value | Description |
 | ----- | ---- | ----- | ----------- |
-| `-c` | `--config` | `<PATH>` | Use this configuration instead of /etc/adbyss.yaml. |
+| `-c` | `--config` | `<PATH>` | Use this configuration instead of /etc/adbyss.toml. |
 
-After running Adbyss for the first time, you might find some web sites are no longer working as expected. Most likely you're blocking an evil dependency the web site thinks it *needs*. No worries, just open your browser's Network Dev Tool window and reload the page. Make note of any failing domain(s), and update the `/etc/adbyss.yaml` configuration accordingly.
+After running Adbyss for the first time, you might find some web sites are no longer working as expected. Most likely you're blocking an evil dependency the web site thinks it *needs*. No worries, just open your browser's Network Dev Tool window and reload the page. Make note of any failing domain(s), and update the `/etc/adbyss.toml` configuration accordingly.
 
 Restart your browser and/or computer and everything should be peachy again.
 
@@ -71,7 +71,7 @@ It is important to remember that scammers and capitalists birth new schemes all
 
 ## Automation
 
-The repository contains two `systemd` scripts — a [timer](https://github.com/Blobfolio/adbyss/tree/master/adbyss/skel/systemd/adbyss.timer) and a [service](https://github.com/Blobfolio/adbyss/tree/master/adbyss/skel/systemd/adbyss.service) — that can be used to automatically update your `/etc/hosts` file once daily using the global settings (stored in `/etc/adbyss.yaml`).
+The repository contains two `systemd` scripts — a [timer](https://github.com/Blobfolio/adbyss/tree/master/adbyss/skel/systemd/adbyss.timer) and a [service](https://github.com/Blobfolio/adbyss/tree/master/adbyss/skel/systemd/adbyss.service) — that can be used to automatically update your `/etc/hosts` file once daily using the global settings (stored in `/etc/adbyss.toml`).
 
 If you installed Adbyss using the pre-built `.deb` package, all you need to do is enable and start the timer, then you can forget all about it!
 

adbyss/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "adbyss"
-version = "0.20.0"
+version = "0.21.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -18,11 +18,11 @@ extended-description = ""
 section = "net"
 assets = [
     ["../target/release/adbyss", "usr/bin/", "755"],
-    ["./skel/adbyss.yaml", "etc/", "644"],
+    ["./skel/adbyss.toml", "etc/", "644"],
     ["../release/completions/adbyss.bash", "etc/bash_completion.d/", "644"],
     ["../release/man/adbyss.1.gz", "usr/share/man/man1/", "644"],
 ]
-conf-files = [ "/etc/adbyss.yaml" ]
+conf-files = [ "/etc/adbyss.toml" ]
 maintainer-scripts = "./skel/systemd/"
 
 [package.metadata.deb.systemd-units]
@@ -71,13 +71,13 @@ description = 'Non-interactive mode; answer "yes" to all prompts.'
 short = "-c"
 long = "--config"
 label = "<FILE>"
-description = "Use this configuration instead of /etc/adbyss.yaml."
+description = "Use this configuration instead of /etc/adbyss.toml."
 path = true
 
 [[package.metadata.bashman.sections]]
 name = "GLOBAL"
 inside = true
-lines = [ "Additional settings are stored in /etc/adbyss.yaml. Edit those to set your preferred global runtime behaviors." ]
+lines = [ "Additional settings are stored in /etc/adbyss.toml. Edit those to set your preferred global runtime behaviors." ]
 
 [[package.metadata.bashman.sections]]
 name = "SOURCE LISTS"
@@ -91,11 +91,11 @@ items = [
 [dependencies]
 argyle = "0.13.*"
 dactyl = "0.13.*"
-fyi_msg = "2.3.*"
+fyi_msg = "2.4.*"
 regex = "1.11.*"
-serde_yml = "=0.0.12"
+toml = "=0.9.*"
 trimothy = "0.9.*"
-utc2k = "0.16.*"
+utc2k = "0.17.*"
 write_atomic = "0.7.*"
 
 [dependencies.adbyss_psl]
@@ -105,7 +105,7 @@ features = [ "serde" ]
 [dependencies.minreq]
 version = "2.14.*"
 default-features = false
-features = ["https"]
+features = [ "https" ]
 
 [dependencies.nix]
 version = "0.30.*"

adbyss/skel/adbyss.yaml adbyss/skel/adbyss.tomladbyss/skel/adbyss.yaml renamed to adbyss/skel/adbyss.toml

@@ -20,7 +20,7 @@
 # See https://en.wikipedia.org/wiki/Hosts_(file) for general information.
 ##
 
-hostfile: "/etc/hosts"
+hostfile = "/etc/hosts"
 
 
 ##
@@ -30,7 +30,7 @@ hostfile: "/etc/hosts"
 # updating it with any shitlist changes.
 ##
 
-backup: true
+backup = true
 
 
 ##
@@ -47,7 +47,7 @@ backup: true
 # false.
 ##
 
-compact: true
+compact = true
 
 
 ##
@@ -57,10 +57,10 @@ compact: true
 # value to false.
 ##
 
-source_adaway: true
-source_adbyss: true
-source_stevenblack: true
-source_yoyo: true
+source_adaway = true
+source_adbyss = true
+source_stevenblack = true
+source_yoyo = true
 
 
 ##
@@ -71,11 +71,12 @@ source_yoyo: true
 #
 # Add any such hosts below to have them excluded from the blocklists, like:
 #
-# exclude:
-#   - example1.com
-#   - example2.com
+# exclude = [
+#  "example1.com",
+#  "example2.com",
+# ]
 ##
-exclude: []
+exclude = []
 
 
 ##
@@ -95,25 +96,25 @@ exclude: []
 #
 # In practice this would look something like:
 #
-# regexclude:
-#   - '(.+\.)*example.com$'
+# regexclude = [ '(.+\.)*example.com$' ]
 ##
 
-regexclude: []
+regexclude = []
 
 
 ##
 # Custom Blocks
 #
 # If you have additional enemeies, add the host(s) below, like:
 #
-# include:
-#   - example1.com
-#   - example2.com
+# include = [
+#   "example1.com",
+#   "example2.com",
+# ]
 #
 # You can also save any number of custom entries directly to your hostfile.
 # Adbyss will preserve anything prior to the ADBYSS block when writing
 # blocklist updates (unless the --no-preserve flag is set).
 ##
 
-include: []
+include = []

adbyss/skel/test.toml

@@ -0,0 +1,25 @@
+##
+# This configuration is used for unit tests.
+##
+
+hostfile = "/etc/hosts"
+backup = false
+compact = false
+
+source_adaway = false
+source_adbyss = true
+source_stevenblack = false
+source_yoyo = false
+
+exclude = [
+	"collect.snitcher.com"
+]
+
+regexclude = [
+	'(.+\.)*triptease.io$'
+]
+
+include = [
+	"batman.com",
+	"spiderman.com",
+]

adbyss/skel/test.yaml

@@ -41,14 +41,14 @@ FLAGS:
     -y, --yes          Non-interactive mode; answer "yes" to all prompts.
 
 OPTIONS:
-    -c, --config <path>    Use this configuration instead of /etc/adbyss.yaml.
+    -c, --config <path>    Use this configuration instead of /etc/adbyss.toml.
 
 SOURCES:
     AdAway:       <https://adaway.org/>
     Steven Black: <https://github.com/StevenBlack/hosts>
     Yoyo:         <https://pgl.yoyo.org/adservers/>
 
-Additional global settings are stored in /etc/adbyss.yaml.
+Additional global settings are stored in /etc/adbyss.toml.
 "#);
 
 

adbyss/src/err.rs

@@ -27,7 +27,7 @@ use std::{
 
 
 
-#[expect(clippy::struct_excessive_bools, reason = "The fields mirror our YAML config.")]
+#[expect(clippy::struct_excessive_bools, reason = "The fields mirror our TOML config.")]
 #[derive(Debug, Clone, Deserialize)]
 #[serde(default)]
 /// # Settings.
@@ -89,14 +89,14 @@ impl Settings {
 	pub(super) const DEFAULT_HOSTFILE: &str = "/etc/hosts";
 
 	/// # Default Config Location.
-	pub(super) const DEFAULT_CONFIG: &str = "/etc/adbyss.yaml";
+	pub(super) const DEFAULT_CONFIG: &str = "/etc/adbyss.toml";
 
 	/// # From File.
 	pub(super) fn from_file<P: AsRef<Path>>(src: P) -> Result<Self, AdbyssError> {
 		let src = src.as_ref();
 		let raw = std::fs::read_to_string(src)
 			.map_err(|_| AdbyssError::Read(src.to_string_lossy().into_owned()))?;
-		serde_yml::from_str::<Self>(&raw)
+		toml::from_str::<Self>(&raw)
 			.map_err(|e| AdbyssError::Parse(e.to_string()))
 	}
 }
@@ -152,7 +152,7 @@ impl Settings {
 		let (out, len) = self.build()?;
 
 		// Double-check with the user before continuing.
-		if ! yes && ! fyi_msg::confirm!(yes: format!(
+		if ! yes && ! fyi_msg::confirm!(@yes format!(
 			"Write {} hosts to {}?",
 			NiceU64::from(len),
 			self.hostfile.display(),
@@ -179,7 +179,7 @@ impl Settings {
 		// We only need to take action if there were entries to begin with.
 		if changed {
 			// Prompt the user before taking any action.
-			if ! yes && ! fyi_msg::confirm!(yes: format!(
+			if ! yes && ! fyi_msg::confirm!(@yes format!(
 				"Remove all Adbyss blackhole entries from {}?",
 				self.hostfile.display(),
 			)) {
@@ -410,7 +410,7 @@ mod tests {
 
 	#[test]
 	fn t_filters() {
-		let settings = Settings::from_file("skel/test.yaml")
+		let settings = Settings::from_file("skel/test.toml")
 			.expect("Unable to parse settings.");
 
 		// The only enabled source should be our own (local) one.

adbyss/src/settings.rs

@@ -2,6 +2,14 @@
 
 
 
+## [0.21.0](https://github.com/Blobfolio/adbyss/releases/tag/v0.21.0) - 2025-09-18
+
+### Changed
+
+* Replace `serde` with `serde_core` (optional dependency)
+
+
+
 ## [0.20.0](https://github.com/Blobfolio/adbyss/releases/tag/v0.20.0) - 2025-08-12
 
 ### New

adbyss_psl/CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "adbyss_psl"
-version = "0.20.0"
+version = "0.21.0"
 license = "WTFPL"
 authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2024"
@@ -23,14 +23,14 @@ serde_json = "1.0.100"
 
 [dev-dependencies]
 brunch = "0.11.*"
-serde = "1.0.*"
+serde_core = "1.0.*"
 serde_json = "1.0.*"
 
 [dependencies]
 idna = "1.0.0"
 trimothy = "0.9.*"
 
-[dependencies.serde]
+[dependencies.serde_core]
 version = "1.0.*"
 default-features = false
 optional = true
@@ -44,7 +44,7 @@ default-features = false
 default = []
 
 # Expose (de)/serialize support for adbyss_psl::Domain.
-serde = [ "dep:serde" ]
+serde = [ "dep:serde_core" ]
 
 # Add sqlx type/decode/encode support for adbyss_psl::Domain.
 sqlx-mysql = [ "sqlx", "sqlx/mysql" ]

adbyss_psl/Cargo.toml

@@ -2,7 +2,7 @@
 # Adbyss: Serde Extensions.
 */
 
-use serde::{
+use serde_core::{
 	de,
 	Deserialize,
 	Serialize,