Restructure crates and switch to Zed

Change filter to whitelist
Lints and build commands
2026-05-31 16:54:30 -06:00 · 2025-11-02 10:28:13 -07:00 · 2025-09-20 20:34:57 -06:00 · 2025-04-04 23:31:17 -06:00 · 2025-03-11 21:47:02 -06:00
15 changed files with 266 additions and 235 deletions
@@ -1,9 +0,0 @@
-{
-	"recommendations": [
-		"vadimcn.vscode-lldb",
-		"barbosshack.crates-io",
-		"usernamehw.errorlens",
-		"tamasfe.even-better-toml",
-		"rust-lang.rust-analyzer",
-	]
-}
@@ -1,33 +0,0 @@
-{
-	// VSCode
-	"editor.detectIndentation": false,
-	"editor.insertSpaces": false,
-	"editor.tabSize": 4,
-	"files.exclude": {
-		"**/target": true,
-		"**/Cargo.lock": true,
-	},
-	"files.insertFinalNewline": true,
-	"files.trimFinalNewlines": true,
-	"files.trimTrailingWhitespace": true,
-	"files.watcherExclude": {
-		"**/.git/**": true,
-		"**/target/**": true,
-	},
-	// Extensions
-	"crates.listPreReleases": true,
-	"evenBetterToml.formatter.alignComments": true,
-	"evenBetterToml.formatter.alignEntries": false,
-	"evenBetterToml.formatter.allowedBlankLines": 1,
-	"evenBetterToml.formatter.arrayAutoExpand": true,
-	"evenBetterToml.formatter.arrayTrailingComma": true,
-	"evenBetterToml.formatter.columnWidth": 80,
-	"evenBetterToml.formatter.reorderKeys": true,
-	"evenBetterToml.formatter.trailingNewline": true,
-	"rust-analyzer.imports.granularity.enforce": true,
-	"rust-analyzer.imports.granularity.group": "module",
-	"rust-analyzer.imports.group.enable": true,
-	"rust-analyzer.imports.merge.glob": false,
-	"rust-analyzer.imports.preferNoStd": true,
-	"rust-analyzer.showUnlinkedFileNotification": false,
-}
@@ -0,0 +1,25 @@
+{
+	"languages": {
+		"TOML": {
+			"format_on_save": "on",
+			"formatter": { "language_server": { "name": "tombi" } },
+		},
+	},
+	"lsp": {
+		"rust-analyzer": {
+			"initialization_options": {
+				"imports": {
+					"granularity": { "enforce": true, "group": "module" },
+					"group": { "enable": true },
+					"merge": { "glob": false },
+					"preferNoStd": true,
+				},
+				"server": {
+					"extraEnv": {
+						"RUSTUP_TOOLCHAIN": "stable",
+					},
+				},
+			},
+		},
+	},
+}
@@ -3,4 +3,5 @@ How to Contribute

 We'd love to accept your patches and contributions to this project.
 We just need you to follow the Contributor License Agreement outlined
-in the latest v0.0.x of https://github.com/Skrunix/license
+in the latest v0.0.x of https://git.skrundz.dev/skrunix/license
+(mirrored to https://github.com/skrunix/license)
@@ -4,9 +4,9 @@ version = 4

 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -19,59 +19,60 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"

 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
 dependencies = [
 "utf8parse",
 ]

 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
 "windows-sys",
 ]

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
 "anstyle",
- "once_cell",
+ "once_cell_polyfill",
 "windows-sys",
 ]

 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"

 [[package]]
 name = "bincode"
-version = "2.0.0-rc.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95"
+checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
 dependencies = [
 "serde",
+ "unty",
 ]

 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -79,9 +80,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
 dependencies = [
 "anstream",
 "anstyle",
@@ -91,9 +92,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -103,42 +104,42 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"

 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"

 [[package]]
 name = "csv"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf"
+checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938"
 dependencies = [
 "csv-core",
 "itoa",
 "ryu",
- "serde",
+ "serde_core",
 ]

 [[package]]
 name = "csv-core"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d"
+checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"

 [[package]]
 name = "heck"
@@ -148,7 +149,7 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

 [[package]]
 name = "ipfilter"
-version = "0.0.0"
+version = "0.0.2"
 dependencies = [
 "bincode",
 "ipnet",
@@ -157,7 +158,7 @@ dependencies = [

 [[package]]
 name = "ipfilter-cli"
-version = "0.0.0"
+version = "0.0.2"
 dependencies = [
 "anyhow",
 "clap",
@@ -169,9 +170,9 @@ dependencies = [

 [[package]]
 name = "ipnet"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"

 [[package]]
 name = "iprange"
@@ -185,9 +186,9 @@ dependencies = [

 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"

 [[package]]
 name = "itertools"
@@ -200,60 +201,70 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"

 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"

 [[package]]
-name = "once_cell"
-version = "1.20.3"
+name = "once_cell_polyfill"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"

 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "ryu"
-version = "1.0.19"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"

 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -268,9 +279,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -279,9 +290,15 @@ dependencies = [

 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unty"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"

 [[package]]
 name = "utf8parse"
@@ -289,75 +306,17 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-targets",
+ "windows-link",
 ]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
@@ -1,31 +1,48 @@
 [workspace]
-members = ["cli", "ipfilter"]
 resolver = "2"
+members = ["crates/*"]

 [workspace.package]
-authors = ["David Skrundz"]
-edition = "2024"
 license-file = "LICENSE.md"
+
+edition = "2024"
 rust-version = "1.85.0"

-[workspace.lints.rust]
-unsafe_code = "forbid"
-
-[profile.release]
-codegen-units = 1
-lto = "fat"
-opt-level = 3
-strip = "debuginfo"
-
 [workspace.dependencies]
-ipfilter = { path = "ipfilter", version = "=0.0.0", default-features = false }
+ipfilter = { path = "crates/ipfilter", version = "=0.0.2", default-features = false }
+ipfilter-cli = { path = "crates/cli", version = "=0.0.2", default-features = false }

-bincode = { version = "2.0.0-rc.3", default-features = false }
+bincode = { version = "^2", default-features = false }  # 3.x is effectively a yank

 anyhow = { version = "^1", default-features = false }
-clap = { version = "^4", default-features = false, features = ["std"] }
+clap = { version = "^4", default-features = false }
 csv = { version = "^1", default-features = false }
 ipnet = { version = "^2", default-features = false }
 iprange = { version = "^0.6", default-features = false }
 itertools = { version = "^0.14", default-features = false }
-serde = { version = "^1", default-features = false }
+
+[workspace.lints.clippy]
+arithmetic_side_effects = "forbid"
+as_conversions = "forbid"
+checked_conversions = "forbid"
+default_union_representation = "forbid"
+expect_used = "forbid"
+indexing_slicing = "forbid"
+integer_division = "forbid"
+integer_division_remainder_used = "forbid"
+transmute_undefined_repr = "forbid"
+unchecked_time_subtraction = "forbid"
+unwrap_used = "forbid"
+
+[workspace.lints.rust]
+arithmetic_overflow = "forbid"
+missing_docs = "forbid"
+unsafe_code = "forbid"
+unused_doc_comments = "forbid"
+
+[profile.release]
+opt-level = 3
+strip = "debuginfo"
+overflow-checks = true
+lto = "fat"
+codegen-units = 1
@@ -6,20 +6,23 @@ A set of crates for the construction and use of optimized IP filtering mechanism

 1. Create `private/secret.sh` containing `export IP2LOCATION_TOKEN=''`
 1. Run `./private/dl.sh DB1LITECSV DB1LITECSVIPV6`
-1. List available countries using `cargo run -- -f private/DB1-LITE-V4.CSV list`
-1. Generate a filter using `cargo run -- -i ./private/DB1-LITE-V4.CSV merge -c BD,BR,CN,HK,IL,IN,IQ,IR,KP,PK,QA,RO,RS,RU,SA,SG,SO,SS,SY,TR,TW,UA,DZ -o ./private/filter4.bin`
-1. Generate a filter using `cargo run -- -i ./private/DB1-LITE-V6.CSV merge -c BD,BR,CN,HK,IL,IN,IQ,IR,KP,PK,QA,RO,RS,RU,SA,SG,SO,SS,SY,TR,TW,UA,DZ -6 -o ./private/filter6.bin`
+1. List available countries using `cargo run -- -i private/DB1-LITE-V4.CSV list`
+1. Generate a filter using `cargo run -- -i ./private/DB1-LITE-V4.CSV merge -c CA -o ./private/filter4.bin`
+1. Generate a filter using `cargo run -- -i ./private/DB1-LITE-V6.CSV merge -c CA -6 -o ./private/filter6.bin`
 1. Verify IP ranges using `cargo run -- -i ./private/filter4.bin load` or `cargo run -- -i ./private/filter6.bin load -6`

 ###### Round trip checks
-1. `diff <(cargo run -- -i ./private/DB1-LITE-V4.CSV merge -c BD,BR,CN,HK,IL,IN,IQ,IR,KP,PK,QA,RO,RS,RU,SA,SG,SO,SS,SY,TR,TW,UA,DZ) <(cargo run -- -i ./private/filter4.bin load)`
-1. `diff <(cargo run -- -i ./private/DB1-LITE-V6.CSV merge -c BD,BR,CN,HK,IL,IN,IQ,IR,KP,PK,QA,RO,RS,RU,SA,SG,SO,SS,SY,TR,TW,UA,DZ -6) <(cargo run -- -i ./private/filter6.bin load -6)`
+1. `diff <(cargo run -- -i ./private/DB1-LITE-V4.CSV merge -c CA) <(cargo run -- -i ./private/filter4.bin load)`
+1. `diff <(cargo run -- -i ./private/DB1-LITE-V6.CSV merge -c CA -6) <(cargo run -- -i ./private/filter6.bin load -6)`

 ## Various builds

 - build: `cargo hack --feature-powerset build`
 - clippy: `cargo hack --feature-powerset clippy -- -D warnings`
- fmt: `cargo fmt --check`
+- test: `cargo hack --feature-powerset test`
+- test old: `cargo +1.85 hack --feature-powerset test`
 - miri: `cargo +nightly hack --feature-powerset miri test`
+- fmt: `cargo fmt --check`
 - docs: `RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features`
+- semver: `cargo semver-checks --all-features`
 - publish: `cargo publish --dry-run -p ipfilter`
@@ -1,26 +0,0 @@
-[package]
-name = "ipfilter-cli"
-version = "0.0.0"
-
-authors.workspace = true
-edition.workspace = true
-license-file.workspace = true
-rust-version.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-ipfilter = { workspace = true, features = ["std"] }
-
-anyhow = { workspace = true }
-clap = { workspace = true, features = [
-	"derive",
-	"color",
-	"help",
-	"suggestions",
-	"usage",
-] }
-csv = { workspace = true }
-ipnet = { workspace = true }
-itertools = { workspace = true }
@@ -0,0 +1,43 @@
+[package]
+name = "ipfilter-cli"
+version = "0.0.2"
+license-file.workspace = true
+
+edition.workspace = true
+rust-version.workspace = true
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[dependencies]
+anyhow = { workspace = true }
+clap = { workspace = true, features = [
+	"color",
+	"derive",
+	"help",
+	"std",
+	"suggestions",
+	"usage",
+] }
+csv = { workspace = true }
+ipfilter = { workspace = true, features = ["std"] }
+ipnet = { workspace = true }
+itertools = { workspace = true }
+
+[lints.clippy]
+arithmetic_side_effects = "deny"
+as_conversions = "deny"
+checked_conversions = "deny"
+default_union_representation = "deny"
+expect_used = "deny"
+indexing_slicing = "deny"
+integer_division = "deny"
+integer_division_remainder_used = "deny"
+transmute_undefined_repr = "deny"
+unchecked_time_subtraction = "deny"
+unwrap_used = "deny"
+
+[lints.rust]
+arithmetic_overflow = "forbid"
+unsafe_code = "forbid"
@@ -4,7 +4,7 @@ use std::fs;

 use ipfilter::{v4, v6};

-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::Parser;
 use ipnet::{Ipv4Subnets, Ipv6Subnets};

@@ -12,6 +12,14 @@ mod cli;
 use cli::{Cli, Commands};
 use itertools::Itertools;

+// RiRs
+//
+// APNIC   - https://ftp.apnic.net/stats/apnic/delegated-apnic-extended-latest
+// ARIN    - https://ftp.arin.net/pub/stats/arin/delegated-arin-extended-latest
+// RIPE    - https://ftp.ripe.net/pub/stats/ripencc/delegated-ripencc-extended-latest
+// LACNIC  - https://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-extended-latest
+// AFRINIC - https://ftp.afrinic.net/pub/stats/afrinic/delegated-afrinic-extended-latest
+
 fn main() -> Result<()> {
 	let cli = Cli::parse();

@@ -27,7 +35,16 @@ fn main() -> Result<()> {

 			for result in reader.records() {
 				let record = result?;
-				countries.insert((record[2].to_owned(), record[3].to_owned()));
+				countries.insert((
+					record
+						.get(2)
+						.context("record is missing index 2")?
+						.to_owned(),
+					record
+						.get(3)
+						.context("record is missing index 3")?
+						.to_owned(),
+				));
 			}

 			let mut countries: Vec<_> = countries.drain().collect();
@@ -50,7 +67,7 @@ fn main() -> Result<()> {

 			let records = reader
 				.records()
-				.filter_ok(|r| countries.contains(&r[2]))
+				.filter_ok(|r| r.get(2).map(|r| countries.contains(r)).unwrap_or(false))
 				.map(|r| r.map_err(anyhow::Error::from));

 			macro_rules! merge_ip {
@@ -59,8 +76,18 @@ fn main() -> Result<()> {
 						.map(|r| {
 							r.and_then(|record| {
 								Ok(<$net>::new(
-									<$addr>::from_bits(record[0].parse()?),
-									<$addr>::from_bits(record[1].parse()?),
+									<$addr>::from_bits(
+										record
+											.get(0)
+											.context("record is missing index 0")?
+											.parse()?,
+									),
+									<$addr>::from_bits(
+										record
+											.get(1)
+											.context("record is missing index 1")?
+											.parse()?,
+									),
 									0,
 								))
 							})
@@ -1,28 +1,27 @@
 [package]
 name = "ipfilter"
-version = "0.0.0"
+version = "0.0.2"
+license-file.workspace = true

 description = "A library to streamline IP filtering"
 repository = "https://github.com/QuantumShade/ipfilter"
+categories = ["network-programming"]

-authors.workspace = true
 edition.workspace = true
-license-file.workspace = true
 rust-version.workspace = true

 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

-[lints]
-workspace = true
+[dependencies]
+bincode = { workspace = true, features = ["serde"], optional = true }
+ipnet = { workspace = true }
+iprange = { workspace = true, features = ["serde"] }

 [features]
 default = []
 std = ["bincode/std"]

-[dependencies]
-ipnet = { workspace = true }
-iprange = { workspace = true, features = ["serde"] }
-
-bincode = { workspace = true, optional = true, features = ["serde"] }
+[lints]
+workspace = true
@@ -0,0 +1,17 @@
+# ipfilter
+
+[![Crates Version](https://img.shields.io/crates/v/ipfilter.svg)](https://crates.io/crates/ipfilter)
+
+## Example
+
+```rust
+use core::net::Ipv4Addr;
+use std::fs::File;
+
+fn main() {
+	let file = File::open("whitelist.bin").unwrap();
+	let whitelist = ipfilter::v4::read_from(&mut &file).unwrap();
+
+	assert!(whitelist.contains(&Ipv4Addr::LOCALHOST));
+}
+```
@@ -1,9 +1,6 @@
 //! A library to streamline IP filtering. Supports creating, serializing, and
 //! deserializing [Ipv4Range] and [Ipv6Range] for optimized filtering.

-#![forbid(unused_doc_comments)]
-#![forbid(missing_docs)]
-#![forbid(unsafe_code)]
 #![cfg_attr(docsrs, feature(doc_cfg))]

 macro_rules! declare_filter {
@@ -0,0 +1,11 @@
+toml-version = "v1.0.0"
+
+[format.rules]
+indent-style = "tab"
+indent-width = 4
+
+# Required for rust <1.94
+[[schemas]]
+toml-version = "v1.0.0"
+path = "tombi://www.schemastore.org/cargo.json"
+include = ["Cargo.toml"]
Author	SHA1	Message	Date
davidskrundz	4b2f134aaf	Restructure crates and switch to Zed	2026-05-31 16:54:30 -06:00
davidskrundz	778371b459	Change filter to whitelist	2025-11-02 10:28:13 -07:00
davidskrundz	40e881589a	Lints and build commands	2025-09-20 20:34:57 -06:00
davidskrundz	f22a283abe	Additional lints	2025-04-04 23:31:17 -06:00
davidskrundz	5cc5e1340b	Update dependencies, add readme	2025-03-11 21:47:02 -06:00