Unreviewed changes
4 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:
```
The name of the file: src/storage/lib/vfs/rust/src/directory.rs
Insertions: 2, Deletions: 2.
@@ -76,6 +76,6 @@
/// Helper function to serve a new connection to `directory` as read-only (i.e. with
/// [`fio::PERM_READABLE`]). Errors will be communicated via epitaph on the returned proxy. A new
/// [`crate::execution_scope::ExecutionScope`] will be created for the request.
-pub fn serve_read_only<D: Directory + ?Sized>(dir: Arc<D>) -> fio::DirectoryProxy {
- crate::serve_directory(dir, Path::dot(), fio::PERM_READABLE)
+pub fn serve_read_only<D: Directory + ?Sized>(directory: Arc<D>) -> fio::DirectoryProxy {
+ crate::serve_directory(directory, Path::dot(), fio::PERM_READABLE)
}
```
```
The name of the file: src/lib/fuchsia-fs/src/lib.rs
Insertions: 1, Deletions: 3.
@@ -32,11 +32,9 @@
use std::fs;
use std::path::Path;
use tempfile::TempDir;
- use vfs::directory::entry_container::Directory;
- use vfs::execution_scope::ExecutionScope;
use vfs::file::vmo::read_only;
+ use vfs::pseudo_directory;
use vfs::remote::remote_dir;
- use vfs::{pseudo_directory, ObjectRequest};
use {fuchsia_async as fasync, zx_status};
#[fasync::run_singlethreaded(test)]
```
```
The name of the file: src/sys/pkg/bin/pkg-cache/src/compat/pkgfs/validation.rs
Insertions: 0, Deletions: 1.
@@ -221,7 +221,6 @@
use vfs::directory::entry::GetEntryInfo;
use vfs::directory::entry_container::Directory;
use vfs::node::Node;
- use vfs::ObjectRequest;
struct TestEnv {
_blobfs: BlobfsRamdisk,
```
```
The name of the file: src/lib/fuchsia-fs/src/directory.rs
Insertions: 1, Deletions: 2.
@@ -775,13 +775,12 @@
use vfs::directory::entry_container::Directory;
use vfs::execution_scope::ExecutionScope;
use vfs::file::vmo::read_only;
+ use vfs::pseudo_directory;
use vfs::remote::remote_dir;
- use vfs::{pseudo_directory, ObjectRequest};
const DATA_FILE_CONTENTS: &str = "Hello World!\n";
#[cfg(target_os = "fuchsia")]
- #[cfg(target_os = "fuchsia")]
const LONG_DURATION: MonotonicDuration = MonotonicDuration::from_seconds(30);
#[cfg(not(target_os = "fuchsia"))]
```
```
The name of the file: src/sys/pkg/lib/blobfs/src/mock.rs
Insertions: 4, Deletions: 2.
@@ -51,7 +51,7 @@
})) => {
assert_eq!(path, merkle.to_string());
assert!(flags.contains(fio::PERM_READABLE));
- assert!(!flags.intersects(fio::PERM_WRITABLE | fio::Flags::FLAG_MAYBE_CREATE));
+ assert!(!flags.intersects(fio::Flags::PERM_WRITE | fio::Flags::FLAG_MAYBE_CREATE));
let stream =
fio::NodeRequestStream::from_channel(fasync::Channel::from_channel(object))
@@ -216,7 +216,9 @@
control_handle: _,
})) => {
assert!(flags.contains(fio::PERM_READABLE));
- assert!(!flags.intersects(fio::PERM_WRITABLE | fio::Flags::FLAG_MAYBE_CREATE));
+ assert!(
+ !flags.intersects(fio::Flags::PERM_WRITE | fio::Flags::FLAG_MAYBE_CREATE)
+ );
let path: Hash = path.parse().unwrap();
let stream =
```