commit a3585fe873c2dbbf060b6501daf0621c48668807
parent 594a01c5b5c2639331650f12a1ae315e474f78f2
Author: Eric Scouten <scouten@adobe.com>
Date: Mon, 19 Dec 2022 10:26:56 -0800
Address new Clippy warnings for Rust 1.66 (#164)
Diffstat:
18 files changed, 63 insertions(+), 82 deletions(-)
diff --git a/make_test_images/src/make_test_images.rs b/make_test_images/src/make_test_images.rs
@@ -262,7 +262,7 @@ impl MakeTestImages {
0 | 1 => img.width() / 2,
_ => img.width() / ing_vec.len() as u32,
};
- let height = img.height() as u32 / 2;
+ let height = img.height() / 2;
let mut x = 0;
for ing in ing_vec {
@@ -361,7 +361,7 @@ impl MakeTestImages {
_ => panic!("bad parameter"),
};
- std::fs::copy(&self.make_path(src), &dst_path).context("copying for make_err")?;
+ std::fs::copy(self.make_path(src), &dst_path).context("copying for make_err")?;
Self::patch_file(&dst_path, search_bytes, replace_bytes)
.context(format!("patching {}", op))?;
@@ -394,7 +394,7 @@ impl MakeTestImages {
"copy" => self.make_copy(recipe)?,
_ => return Err(Error::BadParam(recipe.op.to_string()).into()),
};
- let manifest_store = ManifestStore::from_file(&dst_path);
+ let manifest_store = ManifestStore::from_file(dst_path);
if recipe.op.as_str() != "copy" {
println!("{}", manifest_store?);
diff --git a/sdk/src/assertion.rs b/sdk/src/assertion.rs
@@ -170,10 +170,10 @@ pub trait AssertionJson: Serialize + DeserializeOwned + AssertionBase {
}
}
-/// Assertion data as binary cbor or json depending upon
+/// Assertion data as binary CBOR or JSON depending upon
/// the Assertion type (see spec).
-/// for Json assertions the data is a Json string and Vec<u8> for
-/// binary data and json data to be cbor encoded.
+/// For JSON assertions the data is a JSON string and a Vec of u8 values for
+/// binary data and JSON data to be CBOR encoded.
#[derive(Deserialize, Serialize, PartialEq, Eq, Clone)]
pub enum AssertionData {
Json(String), // json encoded data
diff --git a/sdk/src/assertions/actions.rs b/sdk/src/assertions/actions.rs
@@ -351,7 +351,7 @@ pub mod tests {
.set_when("2015-06-26T16:43:23+0200")
.set_parameter(
"foo".to_owned(),
- &r#"{
+ r#"{
"left": 0,
"right": 2000,
"top": 1000,
@@ -360,7 +360,7 @@ pub mod tests {
.to_owned(),
)
.unwrap()
- .set_parameter("ingredient".to_owned(), &make_hashed_uri1())
+ .set_parameter("ingredient".to_owned(), make_hashed_uri1())
.unwrap()
.set_changed(Some(&["this", "that"].to_vec()))
.set_instance_id("xmp.iid:cb9f5498-bb58-4572-8043-8c369e6bfb9b")
diff --git a/sdk/src/asset_handlers/bmff_io.rs b/sdk/src/asset_handlers/bmff_io.rs
@@ -916,7 +916,7 @@ impl AssetIO for BmffIO {
let root_box = BoxInfo {
path: "".to_string(),
offset: 0,
- size: size as u64,
+ size,
box_type: BoxType::Empty,
parent: None,
user_type: None,
@@ -928,13 +928,7 @@ impl AssetIO for BmffIO {
let mut bmff_map: HashMap<String, Vec<Token>> = HashMap::new();
// build layout of the BMFF structure
- build_bmff_tree(
- &mut input,
- size as u64,
- &mut bmff_tree,
- &root_token,
- &mut bmff_map,
- )?;
+ build_bmff_tree(&mut input, size, &mut bmff_tree, &root_token, &mut bmff_map)?;
// get ftyp location
// start after ftyp
@@ -1019,7 +1013,7 @@ impl AssetIO for BmffIO {
let root_box = BoxInfo {
path: "".to_string(),
offset: 0,
- size: size as u64,
+ size,
box_type: BoxType::Empty,
parent: None,
user_type: None,
@@ -1035,7 +1029,7 @@ impl AssetIO for BmffIO {
temp_file.seek(SeekFrom::Start(0))?;
build_bmff_tree(
&mut temp_file,
- size as u64,
+ size,
&mut output_bmff_tree,
&root_token,
&mut output_bmff_map,
@@ -1076,7 +1070,7 @@ impl AssetIO for BmffIO {
let root_box = BoxInfo {
path: "".to_string(),
offset: 0,
- size: size as u64,
+ size,
box_type: BoxType::Empty,
parent: None,
user_type: None,
@@ -1088,13 +1082,7 @@ impl AssetIO for BmffIO {
let mut bmff_map: HashMap<String, Vec<Token>> = HashMap::new();
// build layout of the BMFF structure
- build_bmff_tree(
- &mut input,
- size as u64,
- &mut bmff_tree,
- &root_token,
- &mut bmff_map,
- )?;
+ build_bmff_tree(&mut input, size, &mut bmff_tree, &root_token, &mut bmff_map)?;
// get position of c2pa manifest
let (c2pa_start, c2pa_length) =
@@ -1156,7 +1144,7 @@ impl AssetIO for BmffIO {
let root_box = BoxInfo {
path: "".to_string(),
offset: 0,
- size: size as u64,
+ size,
box_type: BoxType::Empty,
parent: None,
user_type: None,
@@ -1172,7 +1160,7 @@ impl AssetIO for BmffIO {
temp_file.seek(SeekFrom::Start(0))?;
build_bmff_tree(
&mut temp_file,
- size as u64,
+ size,
&mut output_bmff_tree,
&root_token,
&mut output_bmff_map,
@@ -1211,7 +1199,7 @@ impl AssetPatch for BmffIO {
let root_box = BoxInfo {
path: "".to_string(),
offset: 0,
- size: size as u64,
+ size,
box_type: BoxType::Empty,
parent: None,
user_type: None,
@@ -1223,13 +1211,7 @@ impl AssetPatch for BmffIO {
let mut bmff_map: HashMap<String, Vec<Token>> = HashMap::new();
// build layout of the BMFF structure
- build_bmff_tree(
- &mut asset,
- size as u64,
- &mut bmff_tree,
- &root_token,
- &mut bmff_map,
- )?;
+ build_bmff_tree(&mut asset, size, &mut bmff_tree, &root_token, &mut bmff_map)?;
// get position to insert c2pa
let (c2pa_start, c2pa_length) = if let Some(uuid_tokens) = bmff_map.get("/uuid") {
@@ -1261,7 +1243,7 @@ impl AssetPatch for BmffIO {
let new_c2pa_box_size = new_c2pa_box.len();
if new_c2pa_box_size as u64 == manifest_length {
- asset.seek(SeekFrom::Start(c2pa_start as u64))?;
+ asset.seek(SeekFrom::Start(c2pa_start))?;
asset.write_all(&new_c2pa_box)?;
Ok(())
} else {
@@ -1317,7 +1299,7 @@ pub mod tests {
if let Ok(temp_dir) = tempdir() {
let output = temp_dir_path(&temp_dir, "mp4_test.mp4");
- if let Ok(_size) = std::fs::copy(&source, &output) {
+ if let Ok(_size) = std::fs::copy(source, &output) {
let bmff = BmffIO::new("mp4");
//let test_data = bmff.read_cai_store(&source).unwrap();
@@ -1367,7 +1349,7 @@ pub mod tests {
if let Ok(temp_dir) = tempdir() {
let output = temp_dir_path(&temp_dir, "mp4_test.mp4");
- if let Ok(_size) = std::fs::copy(&source, &output) {
+ if let Ok(_size) = std::fs::copy(source, &output) {
let bmff = BmffIO::new("mp4");
if let Ok(source_data) = bmff.read_cai_store(&output) {
@@ -1394,7 +1376,7 @@ pub mod tests {
let temp_dir = tempdir().unwrap();
let output = temp_dir_path(&temp_dir, "mp4_test.mp4");
- std::fs::copy(&source, &output).unwrap();
+ std::fs::copy(source, &output).unwrap();
let bmff_io = BmffIO::new("mp4");
bmff_io.remove_cai_store(&output).unwrap();
diff --git a/sdk/src/asset_handlers/jpeg_io.rs b/sdk/src/asset_handlers/jpeg_io.rs
@@ -491,7 +491,7 @@ pub mod tests {
let temp_dir = tempfile::tempdir().unwrap();
let output = crate::utils::test::temp_dir_path(&temp_dir, "CA_test.jpg");
- std::fs::copy(&source, &output).unwrap();
+ std::fs::copy(source, &output).unwrap();
let jpeg_io = JpegIO {};
jpeg_io.remove_cai_store(&output).unwrap();
diff --git a/sdk/src/asset_handlers/png_io.rs b/sdk/src/asset_handlers/png_io.rs
@@ -230,7 +230,6 @@ impl CAILoader for PngIO {
0u8;
pcp.length as usize
- (key.len() + _langtag.len() + _transkey.len() + 5)
- as usize
]; // data len - size of key - size of land - size of transkey - 3 "0" string terminators - compressed u8 - compression method u8
if asset_reader.read_exact(&mut data).is_err() {
return false;
@@ -437,7 +436,7 @@ pub mod tests {
let png_io = PngIO {};
let xmp = png_io
- .read_xmp(&mut std::fs::File::open(&ap).unwrap())
+ .read_xmp(&mut std::fs::File::open(ap).unwrap())
.unwrap();
// make sure we can parse it
@@ -477,7 +476,7 @@ pub mod tests {
let temp_dir = tempfile::tempdir().unwrap();
let output = crate::utils::test::temp_dir_path(&temp_dir, "exp-test1_tmp.png");
- std::fs::copy(&source, &output).unwrap();
+ std::fs::copy(source, &output).unwrap();
let png_io = PngIO {};
png_io.remove_cai_store(&output).unwrap();
diff --git a/sdk/src/asset_handlers/tiff_io.rs b/sdk/src/asset_handlers/tiff_io.rs
@@ -1521,7 +1521,7 @@ pub mod tests {
let temp_dir = tempdir().unwrap();
let output = temp_dir_path(&temp_dir, "test.tif");
- std::fs::copy(&source, &output).unwrap();
+ std::fs::copy(source, &output).unwrap();
let tiff_io = TiffIO {};
@@ -1543,7 +1543,7 @@ pub mod tests {
let temp_dir = tempdir().unwrap();
let output = temp_dir_path(&temp_dir, "test.tif");
- std::fs::copy(&source, &output).unwrap();
+ std::fs::copy(source, &output).unwrap();
let tiff_io = TiffIO {};
diff --git a/sdk/src/cose_validator.rs b/sdk/src/cose_validator.rs
@@ -1040,16 +1040,16 @@ pub mod tests {
let mut validation_log = DetailedStatusTracker::new();
let (_, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es256, None);
- let es256_cert = std::fs::read(&cert_path).unwrap();
+ let es256_cert = std::fs::read(cert_path).unwrap();
let (_, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es384, None);
- let es384_cert = std::fs::read(&cert_path).unwrap();
+ let es384_cert = std::fs::read(cert_path).unwrap();
let (_, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es512, None);
- let es512_cert = std::fs::read(&cert_path).unwrap();
+ let es512_cert = std::fs::read(cert_path).unwrap();
let (_, cert_path) = temp_signer::get_rsa_signer(&cert_dir, SigningAlg::Ps256, None);
- let rsa_pss256_cert = std::fs::read(&cert_path).unwrap();
+ let rsa_pss256_cert = std::fs::read(cert_path).unwrap();
if let Ok(signcert) = openssl::x509::X509::from_pem(&es256_cert) {
let der_bytes = signcert.to_der().unwrap();
diff --git a/sdk/src/ingredient.rs b/sdk/src/ingredient.rs
@@ -815,7 +815,7 @@ mod tests_file_io {
// std::env::set_var("RUST_LOG", "debug");
// env_logger::init();
let ap = fixture_path("Purple Square.psd");
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -829,7 +829,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_manifest_jpg() {
let ap = fixture_path(MANIFEST_JPEG);
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -845,7 +845,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_no_manifest_jpg() {
let ap = fixture_path(NO_MANIFEST_JPEG);
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -874,7 +874,7 @@ mod tests_file_io {
}
let ap = fixture_path(MANIFEST_JPEG);
- let ingredient = Ingredient::from_file_with_options(&ap, &MyOptions {}).expect("from_file");
+ let ingredient = Ingredient::from_file_with_options(ap, &MyOptions {}).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -891,7 +891,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_png_no_claim() {
let ap = fixture_path("libpng-test.png");
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -905,7 +905,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_jpg_bad_signature() {
let ap = fixture_path(BAD_SIGNATURE_JPEG);
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
//println!("ingredient = {}", ingredient);
@@ -926,7 +926,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_jpg_prerelease() {
let ap = fixture_path(PRERELEASE_JPEG);
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
stats(&ingredient);
println!("ingredient = {}", ingredient);
@@ -946,7 +946,7 @@ mod tests_file_io {
#[cfg(feature = "file_io")]
fn test_jpg_nested() {
let ap = fixture_path("CIE-sig-CA.jpg");
- let ingredient = Ingredient::from_file(&ap).expect("from_file");
+ let ingredient = Ingredient::from_file(ap).expect("from_file");
println!("ingredient = {}", ingredient);
assert_eq!(ingredient.validation_status(), None);
}
diff --git a/sdk/src/jumbf/boxes.rs b/sdk/src/jumbf/boxes.rs
@@ -202,7 +202,7 @@ pub trait BMFFBox: Any {
let mut size = if self.box_type() != b" " { 8 } else { 0 };
size += self.box_payload_size()?;
- Ok(size as u32)
+ Ok(size)
}
/// Payload size of the box.
diff --git a/sdk/src/manifest.rs b/sdk/src/manifest.rs
@@ -983,7 +983,7 @@ pub(crate) mod tests {
let ap = fixture_path(TEST_SMALL_JPEG);
let temp_dir = tempdir().expect("temp dir");
let test_output = temp_dir_path(&temp_dir, "ws_bad_assertion.jpg");
- std::fs::copy(&ap, &test_output).expect("copy");
+ std::fs::copy(ap, test_output).expect("copy");
let mut manifest = test_manifest();
diff --git a/sdk/src/manifest_store.rs b/sdk/src/manifest_store.rs
@@ -228,7 +228,7 @@ impl std::fmt::Display for ManifestStore {
"{}\"{}\": \"{}\"{}",
&json[..index],
tag,
- base64::encode(&bytes),
+ base64::encode(bytes),
&json[index + idx2 + 1..]
);
}
diff --git a/sdk/src/manifest_store_report.rs b/sdk/src/manifest_store_report.rs
@@ -221,7 +221,7 @@ fn b64_tag(mut json: String, tag: &str) -> String {
"{}\"{}\": \"{}\"{}",
&json[..index],
tag,
- base64::encode(&bytes),
+ base64::encode(bytes),
&json[index + idx2 + 1..]
);
}
@@ -240,7 +240,7 @@ mod tests {
#[test]
fn manifest_store_report() {
let path = fixture_path("CIE-sig-CA.jpg");
- let report = ManifestStoreReport::from_file(&path).expect("load_from_asset");
+ let report = ManifestStoreReport::from_file(path).expect("load_from_asset");
println!("{}", report);
}
}
diff --git a/sdk/src/openssl/ec_signer.rs b/sdk/src/openssl/ec_signer.rs
@@ -203,7 +203,7 @@ mod tests {
fn es256_signer() {
let cert_dir = fixture_path("certs");
- let (signer, _) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es256, None);
+ let (signer, _) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es256, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -218,7 +218,7 @@ mod tests {
fn es384_signer() {
let cert_dir = fixture_path("certs");
- let (signer, _) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es384, None);
+ let (signer, _) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es384, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -233,7 +233,7 @@ mod tests {
fn es512_signer() {
let cert_dir = fixture_path("certs");
- let (signer, _) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es512, None);
+ let (signer, _) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es512, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
diff --git a/sdk/src/openssl/ec_validator.rs b/sdk/src/openssl/ec_validator.rs
@@ -82,7 +82,7 @@ mod tests {
fn sign_and_validate_es256() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es256, None);
+ let (signer, cert_path) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es256, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -92,7 +92,7 @@ mod tests {
assert!(signature.len() >= 64);
assert!(signature.len() <= signer.reserve_size());
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
@@ -105,7 +105,7 @@ mod tests {
fn sign_and_validate_es384() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es384, None);
+ let (signer, cert_path) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es384, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -115,7 +115,7 @@ mod tests {
assert!(signature.len() >= 64);
assert!(signature.len() <= signer.reserve_size());
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
@@ -128,7 +128,7 @@ mod tests {
fn sign_and_validate_es512() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es512, None);
+ let (signer, cert_path) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es512, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -138,7 +138,7 @@ mod tests {
assert!(signature.len() >= 64);
assert!(signature.len() <= signer.reserve_size());
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
@@ -151,7 +151,7 @@ mod tests {
fn bad_sig_es256() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es256, None);
+ let (signer, cert_path) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es256, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -159,7 +159,7 @@ mod tests {
signature.push(10);
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
@@ -172,7 +172,7 @@ mod tests {
fn bad_data_es256() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ec_signer(&cert_dir, SigningAlg::Es256, None);
+ let (signer, cert_path) = temp_signer::get_ec_signer(cert_dir, SigningAlg::Es256, None);
let mut data = b"some sample content to sign".to_vec();
println!("data len = {}", data.len());
@@ -181,7 +181,7 @@ mod tests {
data[5] = 10;
data[6] = 11;
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
diff --git a/sdk/src/openssl/ed_signer.rs b/sdk/src/openssl/ed_signer.rs
@@ -114,7 +114,7 @@ mod tests {
fn ed25519_signer() {
let cert_dir = fixture_path("certs");
- let (signer, _) = temp_signer::get_ed_signer(&cert_dir, SigningAlg::Ed25519, None);
+ let (signer, _) = temp_signer::get_ed_signer(cert_dir, SigningAlg::Ed25519, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
diff --git a/sdk/src/openssl/ed_validator.rs b/sdk/src/openssl/ed_validator.rs
@@ -50,7 +50,7 @@ mod tests {
fn sign_and_validate() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ed_signer(&cert_dir, SigningAlg::Ed25519, None);
+ let (signer, cert_path) = temp_signer::get_ed_signer(cert_dir, SigningAlg::Ed25519, None);
let data = b"some sample content to sign";
println!("data len = {}", data.len());
@@ -60,7 +60,7 @@ mod tests {
assert!(signature.len() >= 64);
assert!(signature.len() <= signer.reserve_size());
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
@@ -72,7 +72,7 @@ mod tests {
fn bad_data() {
let cert_dir = fixture_path("certs");
- let (signer, cert_path) = temp_signer::get_ed_signer(&cert_dir, SigningAlg::Ed25519, None);
+ let (signer, cert_path) = temp_signer::get_ed_signer(cert_dir, SigningAlg::Ed25519, None);
let mut data = b"some sample content to sign".to_vec();
println!("data len = {}", data.len());
@@ -81,7 +81,7 @@ mod tests {
data[5] = 10;
data[6] = 11;
- let cert_bytes = std::fs::read(&cert_path).unwrap();
+ let cert_bytes = std::fs::read(cert_path).unwrap();
let signcert = openssl::x509::X509::from_pem(&cert_bytes).unwrap();
let pub_key = signcert.public_key().unwrap().public_key_to_der().unwrap();
diff --git a/sdk/src/utils/test.rs b/sdk/src/utils/test.rs
@@ -175,7 +175,7 @@ pub fn temp_dir_path(temp_dir: &TempDir, file_name: &str) -> PathBuf {
pub fn temp_fixture_path(temp_dir: &TempDir, file_name: &str) -> PathBuf {
let fixture_src = fixture_path(file_name);
let fixture_copy = temp_dir_path(temp_dir, file_name);
- std::fs::copy(&fixture_src, &fixture_copy).unwrap();
+ std::fs::copy(fixture_src, &fixture_copy).unwrap();
fixture_copy
}
