release: 1.6.8

Blobfolio · Nov 4, 2024 · 4e989cd · 4e989cd
2 parents 35ad12f + a035757
commit 4e989cd
Show file tree

Hide file tree

Showing 18 changed files with 428 additions and 143 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -0,0 +1,94 @@
+# Project Dependencies
+    Package:   rs_mate_poe
+    Version:   1.6.8
+    Target:    wasm32-unknown-unknown
+    Generated: 2024-11-04 04:26:16 UTC
+
+| Package | Version | Author(s) | License | Context |
+| ---- | ---- | ---- | ---- | ---- |
+| [bumpalo](https://github.com/fitzgen/bumpalo) | 3.16.0 | [Nick Fitzgerald](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 | |
+| [itoa](https://github.com/dtolnay/itoa) | 1.0.11 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 | |
+| [js-sys](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/js-sys) | 0.3.72 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [log](https://github.com/rust-lang/log) | 0.4.22 | The Rust Project Developers | MIT OR Apache-2.0 | |
+| [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 | |
+| [quote](https://github.com/dtolnay/quote) | 1.0.37 | [David Tolnay](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 | |
+| [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 | |
+| [wasm-bindgen](https://github.com/rustwasm/wasm-bindgen) | 0.2.95 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [wasm-bindgen-backend](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/backend) | 0.2.95 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [wasm-bindgen-macro](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro) | 0.2.95 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [wasm-bindgen-macro-support](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/macro-support) | 0.2.95 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [wasm-bindgen-shared](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/shared) | 0.2.95 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [web-sys](https://github.com/rustwasm/wasm-bindgen/tree/master/crates/web-sys) | 0.3.72 | The wasm-bindgen Developers | MIT OR Apache-2.0 | |
+| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.11 | [Tom Kaitchuck](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [allocator-api2](https://github.com/zakarumych/allocator-api2) | 0.2.18 | [Zakarum](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [bitflags](https://github.com/bitflags/bitflags) | 2.6.0 | The Rust Project Developers | MIT OR Apache-2.0 | build |
+| [byteorder](https://github.com/BurntSushi/byteorder) | 1.5.0 | [Andrew Gallant](mailto:[email protected]) | Unlicense OR MIT | build |
+| [cc](https://github.com/rust-lang/cc-rs) | 1.1.34 | [Alex Crichton](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [codemap](https://github.com/kevinmehall/codemap) | 0.1.3 | [Kevin Mehall](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [const-str](https://github.com/Nugine/const-str) | 0.3.2 | [Nugine](mailto:[email protected]) | MIT | build |
+| [const-str-proc-macro](https://github.com/Nugine/const-str) | 0.3.2 | [Nugine](mailto:[email protected]) | MIT | build |
+| [convert_case](https://github.com/rutrum/convert-case) | 0.6.0 | [Rutrum](mailto:[email protected]) | MIT | build |
+| [cssparser](https://github.com/servo/rust-cssparser) | 0.33.0 | [Simon Sapin](mailto:[email protected]) | MPL-2.0 | build |
+| [cssparser-color](https://github.com/servo/rust-cssparser) | 0.1.0 | [Emilio Cobos Álvarez](mailto:[email protected]) | MPL-2.0 | build |
+| [cssparser-macros](https://github.com/servo/rust-cssparser) | 0.6.1 | [Simon Sapin](mailto:[email protected]) | MPL-2.0 | build |
+| [dactyl](https://github.com/Blobfolio/dactyl) | 0.7.4 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL | build |
+| [data-encoding](https://github.com/ia0/data-encoding) | 2.6.0 | [Julien Cretin](mailto:[email protected]) | MIT | build |
+| [dtoa](https://github.com/dtolnay/dtoa) | 1.0.9 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [dtoa-short](https://github.com/upsuper/dtoa-short) | 0.3.5 | [Xidorn Quan](mailto:[email protected]) | MPL-2.0 | build |
+| [either](https://github.com/rayon-rs/either) | 1.13.0 | bluss | MIT OR Apache-2.0 | build |
+| [equivalent](https://github.com/cuviper/equivalent) | 1.0.1 |  | Apache-2.0 OR MIT | build |
+| [fxhash](https://github.com/cbreeden/fxhash) | 0.2.1 | [cbreeden](mailto:[email protected]) | Apache-2.0 OR MIT | build |
+| [getrandom](https://github.com/rust-random/getrandom) | 0.2.15 | The Rand Project Developers | MIT OR Apache-2.0 | build |
+| [grass](https://github.com/connorskees/grass) | 0.13.4 | [Connor Skees](mailto:[email protected]) | MIT | build |
+| [grass_compiler](https://github.com/connorskees/grass) | 0.13.4 | [Connor Skees](mailto:[email protected]) | MIT | build |
+| [guff_css](https://github.com/Blobfolio/guff) | 0.5.1 | [Josh Stoik](mailto:[email protected]) | WTFPL | build |
+| [hashbrown](https://github.com/rust-lang/hashbrown) | 0.14.5 | [Amanieu d'Antras](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [hashbrown](https://github.com/rust-lang/hashbrown) | 0.15.0 | [Amanieu d'Antras](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [imagesize](https://github.com/Roughsketch/imagesize) | 0.13.0 | [Maid Dog](mailto:[email protected]) | MIT | build |
+| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.6.0 |  | Apache-2.0 OR MIT | build |
+| [itertools](https://github.com/rust-itertools/itertools) | 0.10.5 | bluss | MIT OR Apache-2.0 | build |
+| [lasso](https://github.com/Kixiron/lasso) | 0.7.3 | [Chase Wilson](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs) | 1.5.0 | [Marvin Löbel](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [lightningcss](https://github.com/parcel-bundler/lightningcss) | 1.0.0-alpha.59 | [Devon Govett](mailto:[email protected]) | MPL-2.0 | build |
+| [lightningcss-derive](https://github.com/parcel-bundler/lightningcss) | 1.0.0-alpha.43 | [Devon Govett](mailto:[email protected]) | MPL-2.0 | build |
+| [memchr](https://github.com/BurntSushi/memchr) | 2.7.4 | [Andrew Gallant](mailto:[email protected]) and bluss | Unlicense OR MIT | build |
+| [minreq](https://github.com/neonmoe/minreq) | 2.12.0 | [Jens Pitkanen](mailto:[email protected]) | ISC | build |
+| [oxford_join](https://github.com/Blobfolio/oxford_join) | 0.4.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL | build |
+| [parcel_selectors](https://github.com/parcel-bundler/lightningcss) | 0.27.0 | The Servo Project Developers | MPL-2.0 | build |
+| [paste](https://github.com/dtolnay/paste) | 1.0.15 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [pathdiff](https://github.com/Manishearth/pathdiff) | 0.2.2 | [Manish Goregaokar](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [phf](https://github.com/sfackler/rust-phf) | 0.10.1 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf](https://github.com/rust-phf/rust-phf) | 0.11.2 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_codegen](https://github.com/sfackler/rust-phf) | 0.10.0 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_generator](https://github.com/sfackler/rust-phf) | 0.10.0 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_generator](https://github.com/rust-phf/rust-phf) | 0.11.2 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_macros](https://github.com/rust-phf/rust-phf) | 0.11.2 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_shared](https://github.com/sfackler/rust-phf) | 0.10.0 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [phf_shared](https://github.com/rust-phf/rust-phf) | 0.11.2 | [Steven Fackler](mailto:[email protected]) | MIT | build |
+| [ppv-lite86](https://github.com/cryptocorrosion/cryptocorrosion) | 0.2.20 | The CryptoCorrosion Contributors | MIT OR Apache-2.0 | build |
+| [precomputed-hash](https://github.com/emilio/precomputed-hash) | 0.1.1 | [Emilio Cobos Álvarez](mailto:[email protected]) | MIT | build |
+| [rand](https://github.com/rust-random/rand) | 0.8.5 | The Rand Project Developers and The Rust Project Developers | MIT OR Apache-2.0 | build |
+| [rand_chacha](https://github.com/rust-random/rand) | 0.3.1 | The Rand Project Developers, The Rust Project Developers, and The CryptoCorrosion Contributors | MIT OR Apache-2.0 | build |
+| [rand_core](https://github.com/rust-random/rand) | 0.6.4 | The Rand Project Developers and The Rust Project Developers | MIT OR Apache-2.0 | build |
+| [ring](https://github.com/briansmith/ring) | 0.17.8 | [Brian Smith](mailto:[email protected]) |  | build |
+| [rustls](https://github.com/rustls/rustls) | 0.21.12 |  | Apache-2.0 OR ISC OR MIT | build |
+| [rustls-webpki](https://github.com/rustls/webpki) | 0.101.7 |  | ISC | build |
+| [ryu](https://github.com/dtolnay/ryu) | 1.0.18 | [David Tolnay](mailto:[email protected]) | Apache-2.0 OR BSL-1.0 | build |
+| [sct](https://github.com/rustls/sct.rs) | 0.7.1 | [Joseph Birr-Pixton](mailto:[email protected]) | Apache-2.0 OR ISC OR MIT | build |
+| [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 | build |
+| [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 | build |
+| [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 | build |
+| [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:[email protected]), and [Garrett Berg](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [siphasher](https://github.com/jedisct1/rust-siphash) | 0.3.11 | [Frank Denis](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [smallvec](https://github.com/servo/rust-smallvec) | 1.13.2 | The Servo Project Developers | MIT OR Apache-2.0 | build |
+| [syn](https://github.com/dtolnay/syn) | 1.0.109 | [David Tolnay](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [trimothy](https://github.com/Blobfolio/trimothy) | 0.3.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL | build |
+| [unicode-segmentation](https://github.com/unicode-rs/unicode-segmentation) | 1.12.0 | [kwantam](mailto:[email protected]) and [Manish Goregaokar](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [untrusted](https://github.com/briansmith/untrusted) | 0.9.0 | [Brian Smith](mailto:[email protected]) | ISC | build |
+| [version_check](https://github.com/SergioBenitez/version_check) | 0.9.5 | [Sergio Benitez](mailto:[email protected]) | MIT OR Apache-2.0 | build |
+| [webpki-roots](https://github.com/rustls/webpki-roots) | 0.25.4 |  | MPL-2.0 | build |
+| [zerocopy](https://github.com/google/zerocopy) | 0.7.35 | [Joshua Liebow-Feeser](mailto:[email protected]) | BSD-2-Clause OR Apache-2.0 OR MIT | build |
+| [zerocopy-derive](https://github.com/google/zerocopy) | 0.7.35 | [Joshua Liebow-Feeser](mailto:[email protected]) | BSD-2-Clause OR Apache-2.0 OR MIT | build |
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "rs_mate_poe"
-version = "1.6.7"
-authors = ["Blobfolio, LLC. <hello@blobfolio.com>"]
+version = "1.6.8"
+authors = ["Josh Stoik <josh@blobfolio.com>"]
 edition = "2021"
-rust-version = "1.73"
+rust-version = "1.81"
 description = "WASM port of Screen Mate Poe."
 license = "WTFPL"
 repository = "https://github.com/Blobfolio/js-mate-poe"
@@ -12,24 +12,21 @@ publish = false
 
 [package.metadata.bashman]
 name = "RS Mate Poe"
-bash-dir = "./"
-man-dir = "./"
-credits-dir = "./"
 
 [lib]
 crate-type = ["cdylib"]
 
 [build-dependencies]
-guff_css = "=0.3.4"
+guff_css = "=0.5.1"
 imagesize = "=0.13.0"
 
 [dependencies]
 itoa = "=1.0.11"
-js-sys = "=0.3.69"
-wasm-bindgen = "=0.2.92"
+js-sys = "=0.3.72"
+wasm-bindgen = "=0.2.95"
 
 [dependencies.web-sys]
-version = "=0.3.69"
+version = "=0.3.72"
 features = [
 	"AddEventListenerOptions",
 	"Blob",

diff --git a/README.md b/README.md
@@ -146,29 +146,6 @@ Thankfully that's easy to do: just click the `#.#.#.xpi` link attached to the [l
 
 
 
-&nbsp;
-## License
-
-Copyright © 2024 [Blobfolio, LLC](https://blobfolio.com) &lt;[email protected]&gt;
-
-This work is free. You can redistribute it and/or modify it under the terms of the Do What The Fuck You Want To Public License, Version 2.
-
-    DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-    Version 2, December 2004
-
-    Copyright (C) 2004 Sam Hocevar <[email protected]>
-
-    Everyone is permitted to copy and distribute verbatim or modified
-    copies of this license document, and changing it is allowed as long
-    as the name is changed.
-
-    DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. You just DO WHAT THE FUCK YOU WANT TO.
-
-
-
 &nbsp;
 ## Credits
 

diff --git a/justfile b/justfile
@@ -213,6 +213,17 @@ cargo_release_dir := cargo_dir + "/wasm32-unknown-unknown/release"
 		--target-dir "{{ cargo_dir }}"
 
 
+# Credits.
+@credits:
+	[ -z "$(which cargo-bashman)" ] || just _credits
+
+
+# Credits (Actual).
+@_credits:
+	cargo bashman -t wasm32-unknown-unknown --no-bash --no-man
+	just _fix-chown "{{ justfile_directory() }}/CREDITS.md"
+
+
 # Build Demo.
 @demo:
 	just _require-app "guff"
@@ -294,6 +305,9 @@ version: _pre_version
 	# Set JS Header Version.
 	sd '@version [\d.]+' "@version $_ver2" "{{ skel_dir }}/js/header.js"
 
+	# Regenerate credits, maybe.
+	just credits
+
 
 # Version requirements.
 @_pre_version:

diff --git a/skel/firefox/Dockerfile b/skel/firefox/Dockerfile
@@ -1,12 +1,12 @@
 # Stage One.
-FROM rust:1.80-bookworm AS stage1
+FROM rust:1.82-bookworm AS stage1
 RUN set -eux; \
 	mkdir /tmp/cargo && \
-	cargo install --root /tmp/cargo --locked --version 0.2.92 wasm-bindgen-cli && \
+	cargo install --root /tmp/cargo --locked --version 0.2.95 wasm-bindgen-cli && \
 	cargo install --root /tmp/cargo --locked --version 0.116.1 wasm-opt
 
 # Stage Two.
-FROM rust:1.80-bookworm
+FROM rust:1.82-bookworm
 
 LABEL Name="JS Mate Poe Firefox Extension Build Environment"
 

diff --git a/skel/firefox/manifest.json b/skel/firefox/manifest.json
@@ -10,7 +10,7 @@
         }
     },
     "name": "JS Mate Poe",
-    "version": "1.6.7",
+    "version": "1.6.8",
     "author": "Blobfolio, LLC",
     "description": "Add Screen Mate Poe to every web site for constant companionship!",
     "homepage_url": "https://github.com/Blobfolio/js-mate-poe",

diff --git a/skel/js/glue.patch b/skel/js/glue.patch
@@ -1,8 +1,8 @@
 diff --git a/rs_mate_poe.js b/rs_mate_poe.js
-index 6299b78..9da08de 100644
+index 23c9bd3..e5fad53 100644
 --- a/rs_mate_poe.js
 +++ b/rs_mate_poe.js
-@@ -227,33 +227,13 @@ export class Poe {
+@@ -227,25 +227,6 @@ export class Poe {
  }
 
  async function __wbg_load(module, imports) {
@@ -13,44 +13,49 @@ index 6299b78..9da08de 100644
 -
 -            } catch (e) {
 -                if (module.headers.get('Content-Type') != 'application/wasm') {
--                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+-                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
 -
 -                } else {
 -                    throw e;
 -                }
 -            }
 -        }
-+    const instance = await WebAssembly.instantiate(module, imports);
-
+-
 -        const bytes = await module.arrayBuffer();
 -        return await WebAssembly.instantiate(bytes, imports);
-+    if (instance instanceof WebAssembly.Instance) {
-+        return { instance, module };
-
-     } else {
--        const instance = await WebAssembly.instantiate(module, imports);
--
--        if (instance instanceof WebAssembly.Instance) {
--            return { instance, module };
 -
--        } else {
--            return instance;
--        }
-+        return instance;
-     }
+-    } else {
+         const instance = await WebAssembly.instantiate(module, imports);
+
+         if (instance instanceof WebAssembly.Instance) {
+@@ -254,7 +235,6 @@ async function __wbg_load(module, imports) {
+         } else {
+             return instance;
+         }
+-    }
  }
 
-@@ -492,13 +472,7 @@ function initSync(module) {
- async function __wbg_init(input) {
+ function __wbg_get_imports() {
+@@ -593,22 +573,8 @@ function initSync(module) {
+ async function __wbg_init(module_or_path) {
      if (wasm !== undefined) return wasm;
 
 -
-     const imports = __wbg_get_imports();
+-    if (typeof module_or_path !== 'undefined') {
+-        if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
+-            ({module_or_path} = module_or_path)
+-        } else {
+-            console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+-        }
+-    }
 -
--    if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
--        input = fetch(input);
+-
+     const imports = __wbg_get_imports();
+
+-    if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) {
+-        module_or_path = fetch(module_or_path);
 -    }
 -
      __wbg_init_memory(imports);
 
-     const { instance, module } = await __wbg_load(await input, imports);
+     const { instance, module } = await __wbg_load(await module_or_path, imports);
diff --git a/skel/js/header.js b/skel/js/header.js
@@ -1,6 +1,6 @@
 /**
  * JS Mate Poe
  *
- * @version 1.6.7
+ * @version 1.6.8
  * @see {{https://github.com/Blobfolio/js-mate-poe}}
  */
diff --git a/src/animation/frame.rs b/src/animation/frame.rs
@@ -2,6 +2,7 @@
 # RS Mate Poe: Frame
 */
 
+#[expect(clippy::missing_docs_in_private_items, reason = "Self-explanatory.")]
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 /// # Animation Frame.
@@ -256,7 +257,7 @@ mod tests {
 	use super::*;
 
 	#[test]
-	#[allow(unsafe_code)]
+	#[expect(unsafe_code, reason = "Needed for transmute.")]
 	fn t_class() {
 		for f in 0..=Frame::None as u8 {
 			// Safety: Frames start at zero and end with None, so f is always