Skip to content

Commit b32baed

Browse files
committed
Fix clippy warnings
Fix: - clippy::needless_borrow Silence: - clippy::manual_flatten Not addressed: - deprecated `llvm_asm!()` is deprecated, but must be used. The new `asm!()` does not allow using `ebx` [1], which holds the argument for the SMMSTORE command. [1]: rust-lang/rust#84658 Signed-off-by: Tim Crawford <tcrawford@system76.com>
1 parent aa3cc19 commit b32baed

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/lib.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#![no_std]
44
#![feature(llvm_asm)]
55
#![allow(clippy::missing_safety_doc)]
6+
#![allow(clippy::manual_flatten)]
67

78
#[macro_use]
89
extern crate alloc;
@@ -144,7 +145,7 @@ impl Iterator for Smmstore {
144145

145146
/// Check if SMMSTORE data is corrupted.
146147
pub fn is_corrupted(data: &[u8]) -> bool {
147-
let smmstore = Smmstore::from_raw(&data);
148+
let smmstore = Smmstore::from_raw(data);
148149
for entry in smmstore {
149150
if let Err(_err) = entry {
150151
return true;
@@ -159,7 +160,7 @@ pub fn is_corrupted(data: &[u8]) -> bool {
159160
/// No error is returned if a corrupted entry is encountered. Instead, the used
160161
/// size up to the corrupted entry is returned.
161162
pub fn used_size(data: &[u8]) -> usize {
162-
let smmstore = Smmstore::from_raw(&data);
163+
let smmstore = Smmstore::from_raw(data);
163164

164165
let mut used = 0;
165166
for entry in smmstore {
@@ -180,7 +181,7 @@ pub fn count_duplicates(data: &[u8]) -> usize {
180181
let mut kv = BTreeMap::<Vec<u8>, Vec<u8>>::new();
181182
let mut duplicates = 0;
182183

183-
let smmstore = Smmstore::from_raw(&data);
184+
let smmstore = Smmstore::from_raw(data);
184185
for entry in smmstore {
185186
if let Ok(entry) = entry {
186187
if kv.insert(entry.key, entry.value).is_some() {
@@ -199,7 +200,7 @@ pub fn count_duplicates(data: &[u8]) -> usize {
199200
pub fn deserialize(data: &[u8]) -> BTreeMap::<Vec<u8>, Vec<u8>> {
200201
let mut kv = BTreeMap::<Vec<u8>, Vec<u8>>::new();
201202

202-
let smmstore = Smmstore::from_raw(&data);
203+
let smmstore = Smmstore::from_raw(data);
203204
for entry in smmstore {
204205
if let Ok(entry) = entry {
205206
kv.insert(entry.key, entry.value);
@@ -232,11 +233,11 @@ pub fn serialize(data: BTreeMap::<Vec<u8>, Vec<u8>>) -> Vec<u8> {
232233
}
233234

234235
// Key
235-
raw.extend_from_slice(&key);
236+
raw.extend_from_slice(key);
236237
offset += key.len();
237238

238239
// Value
239-
raw.extend_from_slice(&value);
240+
raw.extend_from_slice(value);
240241
offset += value.len();
241242

242243
// NULL byte
@@ -256,9 +257,9 @@ pub fn serialize(data: BTreeMap::<Vec<u8>, Vec<u8>>) -> Vec<u8> {
256257

257258
/// Convenience function to create new region of same size with compacted data.
258259
pub fn compact(data: &[u8]) -> Vec<u8> {
259-
let compact = serialize(deserialize(&data));
260+
let compact = serialize(deserialize(data));
260261
let mut new_data = vec![0xFF; data.len()];
261-
new_data[..compact.len()].copy_from_slice(&compact.as_slice());
262+
new_data[..compact.len()].copy_from_slice(compact.as_slice());
262263
new_data
263264
}
264265

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn smmstore() -> Result<()> {
3030
let compact = smmstore::deserialize(&data);
3131
for (key, value) in compact.iter() {
3232
if key.len() > mem::size_of::<Guid>() && !value.is_empty() {
33-
let res = unsafe { smmstore::smmstore_append(&key, &value) };
33+
let res = unsafe { smmstore::smmstore_append(key, value) };
3434
res?;
3535
}
3636
}

0 commit comments

Comments
 (0)