From b81636703223171df63afbfd8ca54dd305a2f3f0 Mon Sep 17 00:00:00 2001 From: Sayan Nandan Date: Fri, 4 Nov 2022 18:23:32 +0530 Subject: [PATCH] Clean up borrows --- harness/src/bundle.rs | 2 +- server/src/auth/keys.rs | 2 +- server/src/config/tests.rs | 6 +++--- server/src/storage/v1/flush.rs | 2 +- sky-macros/src/dbtest_fn.rs | 4 +--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/harness/src/bundle.rs b/harness/src/bundle.rs index d8b72267..c2fae895 100644 --- a/harness/src/bundle.rs +++ b/harness/src/bundle.rs @@ -86,7 +86,7 @@ fn package_binaries(target_folder: PathBuf, mode: BuildMode) -> HarnessResult<() )) })?; f.read_to_end(&mut buffer).unwrap(); - zip.write_all(&*buffer).unwrap(); + zip.write_all(&buffer).unwrap(); buffer.clear(); } zip.finish().unwrap(); diff --git a/server/src/auth/keys.rs b/server/src/auth/keys.rs index f1f61732..f766914f 100644 --- a/server/src/auth/keys.rs +++ b/server/src/auth/keys.rs @@ -41,7 +41,7 @@ const RAN_BYTES_SIZE: usize = 40; pub fn generate_full() -> (String, Authkey) { let mut bytes: [u8; RAN_BYTES_SIZE] = [0u8; RAN_BYTES_SIZE]; openssl::rand::rand_bytes(&mut bytes).unwrap(); - let ret = base64::encode_config(&bytes, base64::BCRYPT); + let ret = base64::encode_config(bytes, base64::BCRYPT); let hash = rcrypt::hash(&ret, rcrypt::DEFAULT_COST).unwrap(); let store_in_db = unsafe { let mut array = AuthkeyArray::new(); diff --git a/server/src/config/tests.rs b/server/src/config/tests.rs index 0b644be7..91d00603 100644 --- a/server/src/config/tests.rs +++ b/server/src/config/tests.rs @@ -556,7 +556,7 @@ mod cli_arg_tests { fn cli_args_okay() { let cfg_layout = load_yaml!("../cli.yml"); let cli_args = ["skyd", "--host", "127.0.0.2"]; - let matches = App::from_yaml(cfg_layout).get_matches_from(&cli_args); + let matches = App::from_yaml(cfg_layout).get_matches_from(cli_args); let ret = cfgcli::parse_cli_args(matches); assert_eq!( ret.cfg.ports, @@ -569,7 +569,7 @@ mod cli_arg_tests { fn cli_args_okay_no_mut() { let cfg_layout = load_yaml!("../cli.yml"); let cli_args = ["skyd", "--restore", "/some/restore/path"]; - let matches = App::from_yaml(cfg_layout).get_matches_from(&cli_args); + let matches = App::from_yaml(cfg_layout).get_matches_from(cli_args); let ret = cfgcli::parse_cli_args(matches); assert!(!ret.is_mutated()); assert!(ret.is_okay()); @@ -578,7 +578,7 @@ mod cli_arg_tests { fn cli_args_fail() { let cfg_layout = load_yaml!("../cli.yml"); let cli_args = ["skyd", "--port", "port2003"]; - let matches = App::from_yaml(cfg_layout).get_matches_from(&cli_args); + let matches = App::from_yaml(cfg_layout).get_matches_from(cli_args); let ret = cfgcli::parse_cli_args(matches); assert!(ret.is_mutated()); assert!(!ret.is_okay()); diff --git a/server/src/storage/v1/flush.rs b/server/src/storage/v1/flush.rs index f11e690c..6fb09b8b 100644 --- a/server/src/storage/v1/flush.rs +++ b/server/src/storage/v1/flush.rs @@ -277,7 +277,7 @@ pub mod oneshot { let mut f = File::create(cowfile_name)?; with_open(&mut f)?; f.sync_all()?; - fs::rename(&cowfile_name, &cowfile_name[..cowfile_name.len() - 1]) + fs::rename(cowfile_name, &cowfile_name[..cowfile_name.len() - 1]) } /// No `partmap` handling. Just flushes the table to the expected location diff --git a/sky-macros/src/dbtest_fn.rs b/sky-macros/src/dbtest_fn.rs index 2b4ef21a..e1f0e8e1 100644 --- a/sky-macros/src/dbtest_fn.rs +++ b/sky-macros/src/dbtest_fn.rs @@ -341,9 +341,7 @@ pub fn generate_test( for attr in &input.attrs { if attr.path.is_ident("test") { let msg = "second test attribute is supplied"; - return syn::Error::new_spanned(&attr, msg) - .to_compile_error() - .into(); + return syn::Error::new_spanned(attr, msg).to_compile_error().into(); } }