Fix warnings in preparation for Rust 1.54.0
This CL fixes several new warnings generated by rustc 1.54.0.
Bug: 194812675
Test: m rust
Change-Id: I104aaf07897db4df89dd1598969dd74221bfdd0b
diff --git a/authfs/src/file.rs b/authfs/src/file.rs
index 44d5000..703eddb 100644
--- a/authfs/src/file.rs
+++ b/authfs/src/file.rs
@@ -20,7 +20,7 @@
fn get_local_binder() -> io::Result<VirtFdService> {
let service_name = "authfs_fd_server";
- get_interface(&service_name).map_err(|e| {
+ get_interface(service_name).map_err(|e| {
io::Error::new(
io::ErrorKind::AddrNotAvailable,
format!("Cannot reach authfs_fd_server binder service: {}", e),
diff --git a/authfs/src/file/remote_file.rs b/authfs/src/file/remote_file.rs
index 037b8ec..903c143 100644
--- a/authfs/src/file/remote_file.rs
+++ b/authfs/src/file/remote_file.rs
@@ -101,7 +101,7 @@
i64::try_from(offset).map_err(|_| io::Error::from_raw_os_error(libc::EOVERFLOW))?;
let size = self
.service
- .writeFile(self.file_fd, &buf, offset)
+ .writeFile(self.file_fd, buf, offset)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e.get_description()))?;
Ok(size as usize) // within range because size is supposed to <= buf.len(), which is a usize
}
diff --git a/authfs/src/fsverity/builder.rs b/authfs/src/fsverity/builder.rs
index 1842425..fda47bc 100644
--- a/authfs/src/fsverity/builder.rs
+++ b/authfs/src/fsverity/builder.rs
@@ -248,7 +248,7 @@
let mut tree = MerkleLeaves::new();
for (index, chunk) in test_data.chunks(CHUNK_SIZE as usize).enumerate() {
let hash = Sha256Hasher::new()?
- .update(&chunk)?
+ .update(chunk)?
.update(&vec![0u8; CHUNK_SIZE as usize - chunk.len()])?
.finalize()?;
diff --git a/authfs/src/fsverity/editor.rs b/authfs/src/fsverity/editor.rs
index 8468cc9..86ff4d6 100644
--- a/authfs/src/fsverity/editor.rs
+++ b/authfs/src/fsverity/editor.rs
@@ -206,7 +206,7 @@
// (original) integrity for the file. To matches what write(2) describes for an error
// case (though it's about direct I/O), "Partial data may be written ... should be
// considered inconsistent", an error below is propagated.
- self.file.write_all_at(&source, output_offset)?;
+ self.file.write_all_at(source, output_offset)?;
// Update the hash only after the write succeeds. Note that this only attempts to keep
// the tree consistent to what has been written regardless the actual state beyond the
@@ -290,7 +290,7 @@
if end > self.data.borrow().len() {
self.data.borrow_mut().resize(end, 0);
}
- self.data.borrow_mut().as_mut_slice()[begin..end].copy_from_slice(&buf);
+ self.data.borrow_mut().as_mut_slice()[begin..end].copy_from_slice(buf);
Ok(buf.len())
}
@@ -318,7 +318,7 @@
format!("read_chunk out of bound: index {}", chunk_index),
)
})?;
- buf[..chunk.len()].copy_from_slice(&chunk);
+ buf[..chunk.len()].copy_from_slice(chunk);
Ok(chunk.len())
}
}
diff --git a/authfs/src/fsverity/verifier.rs b/authfs/src/fsverity/verifier.rs
index 13de42a..1f21b13 100644
--- a/authfs/src/fsverity/verifier.rs
+++ b/authfs/src/fsverity/verifier.rs
@@ -33,7 +33,7 @@
fn hash_with_padding(chunk: &[u8], pad_to: usize) -> Result<HashBuffer, CryptoError> {
let padding_size = pad_to - chunk.len();
- Sha256Hasher::new()?.update(&chunk)?.update(&ZEROS[..padding_size])?.finalize()
+ Sha256Hasher::new()?.update(chunk)?.update(&ZEROS[..padding_size])?.finalize()
}
fn verity_check<T: ReadByChunk>(
@@ -47,7 +47,7 @@
// beyond the file size, including empty file.
assert_ne!(file_size, 0);
- let chunk_hash = hash_with_padding(&chunk, CHUNK_SIZE as usize)?;
+ let chunk_hash = hash_with_padding(chunk, CHUNK_SIZE as usize)?;
fsverity_walk(chunk_index, file_size, merkle_tree)?.try_fold(
chunk_hash,
diff --git a/authfs/src/fusefs.rs b/authfs/src/fusefs.rs
index d2948c7..77743bd 100644
--- a/authfs/src/fusefs.rs
+++ b/authfs/src/fusefs.rs
@@ -49,23 +49,23 @@
pub enum FileConfig {
/// A file type that is verified against fs-verity signature (thus read-only). The file is
/// backed by a local file. Debug only.
- LocalVerifiedReadonlyFile {
+ LocalVerifiedReadonly {
reader: VerifiedFileReader<LocalFileReader, LocalFileReader>,
file_size: u64,
},
/// A file type that is a read-only passthrough from a local file. Debug only.
- LocalUnverifiedReadonlyFile { reader: LocalFileReader, file_size: u64 },
+ LocalUnverifiedReadonly { reader: LocalFileReader, file_size: u64 },
/// A file type that is verified against fs-verity signature (thus read-only). The file is
/// served from a remote server.
- RemoteVerifiedReadonlyFile {
+ RemoteVerifiedReadonly {
reader: VerifiedFileReader<RemoteFileReader, RemoteMerkleTreeReader>,
file_size: u64,
},
/// A file type that is a read-only passthrough from a file on a remote serrver.
- RemoteUnverifiedReadonlyFile { reader: RemoteFileReader, file_size: u64 },
+ RemoteUnverifiedReadonly { reader: RemoteFileReader, file_size: u64 },
/// A file type that is initially empty, and the content is stored on a remote server. File
/// integrity is guaranteed with private Merkle tree.
- RemoteVerifiedNewFile { editor: VerifiedFileEditor<RemoteFileEditor> },
+ RemoteVerifiedNew { editor: VerifiedFileEditor<RemoteFileEditor> },
}
struct AuthFs {
@@ -87,7 +87,7 @@
}
fn get_file_config(&self, inode: &Inode) -> io::Result<&FileConfig> {
- self.file_pool.get(&inode).ok_or_else(|| io::Error::from_raw_os_error(libc::ENOENT))
+ self.file_pool.get(inode).ok_or_else(|| io::Error::from_raw_os_error(libc::ENOENT))
}
}
@@ -207,13 +207,13 @@
// be static.
let inode = num.parse::<Inode>().map_err(|_| io::Error::from_raw_os_error(libc::ENOENT))?;
let st = match self.get_file_config(&inode)? {
- FileConfig::LocalVerifiedReadonlyFile { file_size, .. }
- | FileConfig::LocalUnverifiedReadonlyFile { file_size, .. }
- | FileConfig::RemoteUnverifiedReadonlyFile { file_size, .. }
- | FileConfig::RemoteVerifiedReadonlyFile { file_size, .. } => {
+ FileConfig::LocalVerifiedReadonly { file_size, .. }
+ | FileConfig::LocalUnverifiedReadonly { file_size, .. }
+ | FileConfig::RemoteUnverifiedReadonly { file_size, .. }
+ | FileConfig::RemoteVerifiedReadonly { file_size, .. } => {
create_stat(inode, *file_size, FileMode::ReadOnly)?
}
- FileConfig::RemoteVerifiedNewFile { editor } => {
+ FileConfig::RemoteVerifiedNew { editor } => {
create_stat(inode, editor.size(), FileMode::ReadWrite)?
}
};
@@ -234,13 +234,13 @@
) -> io::Result<(libc::stat64, Duration)> {
Ok((
match self.get_file_config(&inode)? {
- FileConfig::LocalVerifiedReadonlyFile { file_size, .. }
- | FileConfig::LocalUnverifiedReadonlyFile { file_size, .. }
- | FileConfig::RemoteUnverifiedReadonlyFile { file_size, .. }
- | FileConfig::RemoteVerifiedReadonlyFile { file_size, .. } => {
+ FileConfig::LocalVerifiedReadonly { file_size, .. }
+ | FileConfig::LocalUnverifiedReadonly { file_size, .. }
+ | FileConfig::RemoteUnverifiedReadonly { file_size, .. }
+ | FileConfig::RemoteVerifiedReadonly { file_size, .. } => {
create_stat(inode, *file_size, FileMode::ReadOnly)?
}
- FileConfig::RemoteVerifiedNewFile { editor } => {
+ FileConfig::RemoteVerifiedNew { editor } => {
create_stat(inode, editor.size(), FileMode::ReadWrite)?
}
},
@@ -257,13 +257,13 @@
// Since file handle is not really used in later operations (which use Inode directly),
// return None as the handle.
match self.get_file_config(&inode)? {
- FileConfig::LocalVerifiedReadonlyFile { .. }
- | FileConfig::LocalUnverifiedReadonlyFile { .. }
- | FileConfig::RemoteVerifiedReadonlyFile { .. }
- | FileConfig::RemoteUnverifiedReadonlyFile { .. } => {
+ FileConfig::LocalVerifiedReadonly { .. }
+ | FileConfig::LocalUnverifiedReadonly { .. }
+ | FileConfig::RemoteVerifiedReadonly { .. }
+ | FileConfig::RemoteUnverifiedReadonly { .. } => {
check_access_mode(flags, libc::O_RDONLY)?;
}
- FileConfig::RemoteVerifiedNewFile { .. } => {
+ FileConfig::RemoteVerifiedNew { .. } => {
// No need to check access modes since all the modes are allowed to the
// read-writable file.
}
@@ -285,19 +285,19 @@
_flags: u32,
) -> io::Result<usize> {
match self.get_file_config(&inode)? {
- FileConfig::LocalVerifiedReadonlyFile { reader, file_size } => {
+ FileConfig::LocalVerifiedReadonly { reader, file_size } => {
read_chunks(w, reader, *file_size, offset, size)
}
- FileConfig::LocalUnverifiedReadonlyFile { reader, file_size } => {
+ FileConfig::LocalUnverifiedReadonly { reader, file_size } => {
read_chunks(w, reader, *file_size, offset, size)
}
- FileConfig::RemoteVerifiedReadonlyFile { reader, file_size } => {
+ FileConfig::RemoteVerifiedReadonly { reader, file_size } => {
read_chunks(w, reader, *file_size, offset, size)
}
- FileConfig::RemoteUnverifiedReadonlyFile { reader, file_size } => {
+ FileConfig::RemoteUnverifiedReadonly { reader, file_size } => {
read_chunks(w, reader, *file_size, offset, size)
}
- FileConfig::RemoteVerifiedNewFile { editor } => {
+ FileConfig::RemoteVerifiedNew { editor } => {
// Note that with FsOptions::WRITEBACK_CACHE, it's possible for the kernel to
// request a read even if the file is open with O_WRONLY.
read_chunks(w, editor, editor.size(), offset, size)
@@ -318,7 +318,7 @@
_flags: u32,
) -> io::Result<usize> {
match self.get_file_config(&inode)? {
- FileConfig::RemoteVerifiedNewFile { editor } => {
+ FileConfig::RemoteVerifiedNew { editor } => {
let mut buf = vec![0; size as usize];
r.read_exact(&mut buf)?;
editor.write_at(&buf, offset)
@@ -336,7 +336,7 @@
valid: SetattrValid,
) -> io::Result<(libc::stat64, Duration)> {
match self.get_file_config(&inode)? {
- FileConfig::RemoteVerifiedNewFile { editor } => {
+ FileConfig::RemoteVerifiedNew { editor } => {
// Initialize the default stat.
let mut new_attr = create_stat(inode, editor.size(), FileMode::ReadWrite)?;
// `valid` indicates what fields in `attr` are valid. Update to return correctly.
diff --git a/authfs/src/main.rs b/authfs/src/main.rs
index 9d36c3f..d583f92 100644
--- a/authfs/src/main.rs
+++ b/authfs/src/main.rs
@@ -224,7 +224,7 @@
let signature = service.readFsveritySignature(remote_id).context("Failed to read signature")?;
let authenticator = FakeAuthenticator::always_succeed();
- Ok(FileConfig::RemoteVerifiedReadonlyFile {
+ Ok(FileConfig::RemoteVerifiedReadonly {
reader: VerifiedFileReader::new(
&authenticator,
RemoteFileReader::new(service.clone(), remote_id),
@@ -242,7 +242,7 @@
file_size: u64,
) -> Result<FileConfig> {
let reader = RemoteFileReader::new(service, remote_id);
- Ok(FileConfig::RemoteUnverifiedReadonlyFile { reader, file_size })
+ Ok(FileConfig::RemoteUnverifiedReadonly { reader, file_size })
}
fn new_config_local_ro_file(
@@ -259,13 +259,13 @@
let _ = File::open(signature)?.read_to_end(&mut sig)?;
let reader =
VerifiedFileReader::new(&authenticator, file_reader, file_size, sig, merkle_tree_reader)?;
- Ok(FileConfig::LocalVerifiedReadonlyFile { reader, file_size })
+ Ok(FileConfig::LocalVerifiedReadonly { reader, file_size })
}
fn new_config_local_ro_file_unverified(file_path: &Path) -> Result<FileConfig> {
let reader = LocalFileReader::new(File::open(file_path)?)?;
let file_size = reader.len();
- Ok(FileConfig::LocalUnverifiedReadonlyFile { reader, file_size })
+ Ok(FileConfig::LocalUnverifiedReadonly { reader, file_size })
}
fn new_config_remote_new_verified_file(
@@ -273,7 +273,7 @@
remote_id: i32,
) -> Result<FileConfig> {
let remote_file = RemoteFileEditor::new(service, remote_id);
- Ok(FileConfig::RemoteVerifiedNewFile { editor: VerifiedFileEditor::new(remote_file) })
+ Ok(FileConfig::RemoteVerifiedNew { editor: VerifiedFileEditor::new(remote_file) })
}
fn prepare_file_pool(args: &Args) -> Result<BTreeMap<Inode, FileConfig>> {