c2pa-rs

commit 5b94235e8db04f92537fa7f772307aa17e33150f
parent 4669b58f9986d33579ff5723a4455814405403ed
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 23 Jun 2024 14:45:34 +0200

Replace log with tracing

Diffstat:
M
sdk/src/embedded_xmp.rs
 | 
2
+-
M
sdk/src/ingredient.rs
 | 
30
+++++++++++++++++-------------

2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/sdk/src/embedded_xmp.rs b/sdk/src/embedded_xmp.rs
@@ -13,7 +13,7 @@
 
 use std::path::Path;
 
-use log::error;
+use tracing::error;
 use xmp_toolkit::{OpenFileOptions, XmpError, XmpErrorType, XmpFile, XmpMeta};
 
 use crate::{Error, Result};
diff --git a/sdk/src/ingredient.rs b/sdk/src/ingredient.rs
@@ -12,22 +12,19 @@
 // each license.
 
 #![deny(missing_docs)]
+
+use std::{borrow::Cow, io::Cursor};
 #[cfg(feature = "file_io")]
 use std::path::{Path, PathBuf};
-use std::{borrow::Cow, io::Cursor};
 
-use tracing::{debug, error};
 #[cfg(feature = "json_schema")]
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use tracing::{debug, error};
 use uuid::Uuid;
 
-#[cfg(feature = "file_io")]
-use crate::utils::mime::extension_to_mime;
-#[cfg(doc)]
-use crate::Manifest;
 use crate::{
-    assertion::{get_thumbnail_image_type, Assertion, AssertionBase},
+    assertion::{Assertion, AssertionBase, get_thumbnail_image_type},
     assertions::{self, labels, Metadata, Relationship, Thumbnail},
     asset_io::CAIRead,
     claim::{Claim, ClaimAssetData},
@@ -38,12 +35,16 @@ use crate::{
         labels::{manifest_label_from_uri, to_assertion_uri},
     },
     jumbf_io::load_jumbf_from_stream,
-    resource_store::{skip_serializing_resources, ResourceRef, ResourceStore},
-    status_tracker::{log_item, DetailedStatusTracker, StatusTracker},
+    resource_store::{ResourceRef, ResourceStore, skip_serializing_resources},
+    status_tracker::{DetailedStatusTracker, log_item, StatusTracker},
     store::Store,
     utils::{base64, xmp_inmemory_utils::XmpInfo},
     validation_status::{self, status_for_store, ValidationStatus},
 };
+#[cfg(doc)]
+use crate::Manifest;
+#[cfg(feature = "file_io")]
+use crate::utils::mime::extension_to_mime;
 
 #[derive(Debug, Default, Deserialize, Serialize)]
 #[cfg_attr(feature = "json_schema", derive(JsonSchema))]
@@ -864,7 +865,7 @@ impl Ingredient {
                     self.set_thumbnail(format, image)?;
                 }
                 Err(err) => {
-                    log::warn!("Could not create thumbnail. {err}");
+                    tracing::warn!("Could not create thumbnail. {err}");
                 }
             }
         }
@@ -937,7 +938,7 @@ impl Ingredient {
                     ingredient.set_thumbnail(format, image)?;
                 }
                 Err(err) => {
-                    log::warn!("Could not create thumbnail. {err}");
+                    tracing::warn!("Could not create thumbnail. {err}");
                 }
             }
         }
@@ -1332,7 +1333,7 @@ impl Ingredient {
                     ingredient.set_thumbnail(format, image)?;
                 }
                 Err(err) => {
-                    log::warn!("Could not create thumbnail. {err}");
+                    tracing::warn!("Could not create thumbnail. {err}");
                 }
             }
         }
@@ -1412,6 +1413,7 @@ mod tests {
     use wasm_bindgen_test::*;
 
     use super::*;
+
     #[cfg(target_arch = "wasm32")]
     wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 
@@ -1611,8 +1613,10 @@ mod tests_file_io {
     #[cfg(target_arch = "wasm32")]
     use wasm_bindgen_test::*;
 
-    use super::*;
     use crate::utils::test::fixture_path;
+
+    use super::*;
+
     #[cfg(target_arch = "wasm32")]
     wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);