From cf92c01be4e7072b06450310e698372a5be9a761 Mon Sep 17 00:00:00 2001
From: Yann Bonnemay <bonnemay@adobe.com>
Date: Sun, 14 Sep 2025 13:57:50 +0200
Subject: [PATCH 1/2] Edition 2024 (+rustfmt.toml)

Pleasantly uneventful.
---
 Cargo.toml             |  2 +-
 js-src/Builder.spec.ts |  3 ++-
 rustfmt.toml           |  1 +
 src/neon_builder.rs    | 10 +++++-----
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/Cargo.toml b/Cargo.toml
index 710388c..605c9fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "c2pa-node"
 version = "0.1.0"
 license = "MIT"
-edition = "2021"
+edition = "2024"
 exclude = ["index.node"]
 
 [lib]
diff --git a/js-src/Builder.spec.ts b/js-src/Builder.spec.ts
index 3844319..ff7c294 100644
--- a/js-src/Builder.spec.ts
+++ b/js-src/Builder.spec.ts
@@ -119,8 +119,9 @@ describe("Builder", () => {
   beforeAll(async () => {
     await fs.ensureDir(tempDir);
     // Read all test files once
+    const buffer = await fs.readFile("./tests/fixtures/CA.jpg");
     source = {
-      buffer: await fs.readFile("./tests/fixtures/CA.jpg"),
+      buffer,
       mimeType: "jpeg",
     };
     testThumbnail = await fs.readFile("./tests/fixtures/thumbnail.jpg");
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..f216078
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+edition = "2024"
diff --git a/src/neon_builder.rs b/src/neon_builder.rs
index 1fd76d7..9b08883 100644
--- a/src/neon_builder.rs
+++ b/src/neon_builder.rs
@@ -12,7 +12,7 @@
 // each license.
 
 use crate::asset::parse_asset;
-use crate::error::{as_js_error, Error};
+use crate::error::{Error, as_js_error};
 use crate::neon_identity_assertion_signer::NeonIdentityAssertionSigner;
 use crate::neon_signer::{CallbackSignerConfig, NeonCallbackSigner, NeonLocalSigner};
 use crate::runtime::runtime;
@@ -310,7 +310,7 @@ impl NeonBuilder {
                         match output_stream.rewind() {
                             Ok(_) => (),
                             Err(e) => {
-                                return cx.throw_error(format!("Failed to rewind stream: {e}"))
+                                return cx.throw_error(format!("Failed to rewind stream: {e}"));
                             }
                         }
                         match output_stream.read_to_end(&mut buffer) {
@@ -381,7 +381,7 @@ impl NeonBuilder {
                         match output_stream.rewind() {
                             Ok(_) => (),
                             Err(e) => {
-                                return cx.throw_error(format!("Failed to rewind stream: {e}"))
+                                return cx.throw_error(format!("Failed to rewind stream: {e}"));
                             }
                         }
                         match output_stream.read_to_end(&mut buffer) {
@@ -453,7 +453,7 @@ impl NeonBuilder {
                         match output_stream.rewind() {
                             Ok(_) => (),
                             Err(e) => {
-                                return cx.throw_error(format!("Failed to rewind stream: {e}"))
+                                return cx.throw_error(format!("Failed to rewind stream: {e}"));
                             }
                         }
                         match output_stream.read_to_end(&mut buffer) {
@@ -542,7 +542,7 @@ impl NeonBuilder {
             _ => {
                 return cx.throw_error(format!(
                     "Property '{property}' not found or not a valid type"
-                ))
+                ));
             }
         }
 

From 28e939ccfb592b218e124c717fb766f84e552f9e Mon Sep 17 00:00:00 2001
From: Yann Bonnemay <bonnemay@adobe.com>
Date: Thu, 18 Sep 2025 20:59:24 +0200
Subject: [PATCH 2/2] Edition-switch: keep tests as is

---
 js-src/Builder.spec.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js-src/Builder.spec.ts b/js-src/Builder.spec.ts
index ff7c294..3844319 100644
--- a/js-src/Builder.spec.ts
+++ b/js-src/Builder.spec.ts
@@ -119,9 +119,8 @@ describe("Builder", () => {
   beforeAll(async () => {
     await fs.ensureDir(tempDir);
     // Read all test files once
-    const buffer = await fs.readFile("./tests/fixtures/CA.jpg");
     source = {
-      buffer,
+      buffer: await fs.readFile("./tests/fixtures/CA.jpg"),
       mimeType: "jpeg",
     };
     testThumbnail = await fs.readFile("./tests/fixtures/thumbnail.jpg");