Skip to content

Commit

Permalink
Merge branch 'main' into relax-crate-workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
dannycjones committed Jan 2, 2024
2 parents 7b7f59b + 374a0f2 commit 46a8610
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions mountpoint-s3/src/inode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -711,14 +711,14 @@ impl SuperblockInner {

let found_directory = if result
.common_prefixes
.get(0)
.first()
.map(|prefix| prefix.starts_with(&full_path_suffixed))
.unwrap_or(false)
{
true
} else if result
.objects
.get(0)
.first()
.map(|object| object.key.starts_with(&full_path_suffixed))
.unwrap_or(false)
{
Expand Down
2 changes: 1 addition & 1 deletion mountpoint-s3/tests/reftests/reference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ impl Reference {
pub fn new(remote_keys: Vec<(String, MockObject)>) -> Self {
let local_files = vec![];
let local_directories = vec![];
let materialized = build_reference(remote_keys.iter().map(|(k, o)| (k, o)));
let materialized = build_reference(remote_keys.iter().map(|(k, o): &(_, _)| (k, o)));
Self {
remote_keys: remote_keys.into_iter().collect(),
local_files,
Expand Down

0 comments on commit 46a8610

Please sign in to comment.