commit 4f9d0ebb3847369864a4e9ae4d40233d446f302c
parent d771b144e79a1a26c7ff57f452063ec7a1a57c5d
Author: MTRNord <mtrnord1@gmail.com>
Date: Sun, 23 Jun 2024 16:25:19 +0200
Run cargo fmt
Diffstat:
8 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/sdk/src/builder.rs b/sdk/src/builder.rs
@@ -20,22 +20,19 @@ use async_generic::async_generic;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_with::skip_serializing_none;
use uuid::Uuid;
-use zip::{
- write::SimpleFileOptions,
- ZipArchive, ZipWriter,
-};
+use zip::{write::SimpleFileOptions, ZipArchive, ZipWriter};
use crate::{
assertion::{AssertionBase, AssertionDecodeError},
- assertions::{Actions, CreativeWork, Exif, labels, SoftwareAgent, Thumbnail, User, UserCbor},
- AsyncSigner,
+ assertions::{labels, Actions, CreativeWork, Exif, SoftwareAgent, Thumbnail, User, UserCbor},
claim::Claim,
- ClaimGeneratorInfo,
error::{Error, Result},
ingredient::Ingredient,
resource_store::{ResourceRef, ResourceResolver, ResourceStore},
salt::DefaultSalt,
- Signer, store::Store, utils::mime::format_to_mime,
+ store::Store,
+ utils::mime::format_to_mime,
+ AsyncSigner, ClaimGeneratorInfo, Signer,
};
/// A Manifest Definition
@@ -784,13 +781,11 @@ mod tests {
use std::io::Cursor;
use serde_json::json;
-
#[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::*;
- use crate::{Reader, utils::test::temp_signer};
-
use super::*;
+ use crate::{utils::test::temp_signer, Reader};
#[cfg(target_arch = "wasm32")]
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
diff --git a/sdk/src/ingredient.rs b/sdk/src/ingredient.rs
@@ -13,9 +13,9 @@
#![deny(missing_docs)]
-use std::{borrow::Cow, io::Cursor};
#[cfg(feature = "file_io")]
use std::path::{Path, PathBuf};
+use std::{borrow::Cow, io::Cursor};
#[cfg(feature = "json_schema")]
use schemars::JsonSchema;
@@ -23,8 +23,12 @@ 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::{Assertion, AssertionBase, get_thumbnail_image_type},
+ assertion::{get_thumbnail_image_type, Assertion, AssertionBase},
assertions::{self, labels, Metadata, Relationship, Thumbnail},
asset_io::CAIRead,
claim::{Claim, ClaimAssetData},
@@ -35,16 +39,12 @@ use crate::{
labels::{manifest_label_from_uri, to_assertion_uri},
},
jumbf_io::load_jumbf_from_stream,
- resource_store::{ResourceRef, ResourceStore, skip_serializing_resources},
- status_tracker::{DetailedStatusTracker, log_item, StatusTracker},
+ resource_store::{skip_serializing_resources, ResourceRef, ResourceStore},
+ status_tracker::{log_item, DetailedStatusTracker, 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))]
@@ -1613,9 +1613,8 @@ mod tests_file_io {
#[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::*;
- use crate::utils::test::fixture_path;
-
use super::*;
+ use crate::utils::test::fixture_path;
#[cfg(target_arch = "wasm32")]
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
diff --git a/sdk/src/jumbf/boxes.rs b/sdk/src/jumbf/boxes.rs
@@ -31,8 +31,8 @@ use std::{
use byteorder::{BigEndian, ReadBytesExt};
use hex::FromHex;
-use tracing::debug;
use thiserror::Error;
+use tracing::debug;
use crate::jumbf::{boxio, labels};
diff --git a/sdk/src/manifest.rs b/sdk/src/manifest.rs
@@ -16,11 +16,11 @@ use std::{borrow::Cow, collections::HashMap, io::Cursor};
use std::{fs::create_dir_all, path::Path};
use async_generic::async_generic;
-use tracing::{debug, error};
#[cfg(feature = "json_schema")]
use schemars::JsonSchema;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_json::Value;
+use tracing::{debug, error};
use uuid::Uuid;
use crate::{
diff --git a/sdk/src/manifest_store.rs b/sdk/src/manifest_store.rs
@@ -11,12 +11,12 @@
// specific language governing permissions and limitations under
// each license.
+#[cfg(feature = "file_io")]
+use std::path::Path;
use std::{
collections::HashMap,
io::{Read, Seek, Write},
};
-#[cfg(feature = "file_io")]
-use std::path::Path;
use async_generic::async_generic;
#[cfg(feature = "json_schema")]
@@ -25,12 +25,12 @@ use serde::{Deserialize, Serialize};
use crate::{
claim::ClaimAssetData,
- Error,
jumbf::labels::manifest_label_from_uri,
- Manifest,
- Result,
status_tracker::{DetailedStatusTracker, StatusTracker},
- store::Store, utils::base64, validation_status::{status_for_store, ValidationStatus},
+ store::Store,
+ utils::base64,
+ validation_status::{status_for_store, ValidationStatus},
+ Error, Manifest, Result,
};
#[derive(Debug, Serialize, Deserialize)]
@@ -460,9 +460,8 @@ mod tests {
#[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::*;
- use crate::{status_tracker::OneShotStatusTracker, utils::test::create_test_store};
-
use super::*;
+ use crate::{status_tracker::OneShotStatusTracker, utils::test::create_test_store};
#[cfg(target_arch = "wasm32")]
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
diff --git a/sdk/src/utils/hash_utils.rs b/sdk/src/utils/hash_utils.rs
@@ -18,8 +18,6 @@ use std::{
path::Path,
};
-//use conv::ValueFrom;
-use tracing::warn;
// multihash versions
use multibase::{decode, encode};
use multihash::{wrap, Code, Multihash, Sha1, Sha2_256, Sha2_512, Sha3_256, Sha3_384, Sha3_512};
@@ -27,6 +25,8 @@ use range_set::RangeSet;
use serde::{Deserialize, Serialize};
// direct sha functions
use sha2::{Digest, Sha256, Sha384, Sha512};
+//use conv::ValueFrom;
+use tracing::warn;
use crate::{Error, Result};
diff --git a/sdk/src/utils/thumbnail.rs b/sdk/src/utils/thumbnail.rs
@@ -13,7 +13,7 @@
use std::io::{Read, Seek};
-use image::{ImageFormat, io::Reader};
+use image::{io::Reader, ImageFormat};
use crate::{Error, Result};
diff --git a/sdk/src/validation_status.rs b/sdk/src/validation_status.rs
@@ -17,10 +17,10 @@
#![deny(missing_docs)]
-use tracing::debug;
#[cfg(feature = "json_schema")]
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
+use tracing::debug;
use crate::{
assertion::AssertionBase,
