mirror of
https://github.com/Zenithsiz/dcb.git
synced 2026-02-04 00:21:57 +00:00
Updated to 1.54.0-nightly
This commit is contained in:
parent
0fcf06ae82
commit
92938b97d9
@ -13,7 +13,6 @@
|
||||
bindings_after_at,
|
||||
iter_map_while,
|
||||
array_chunks,
|
||||
ordering_helpers,
|
||||
const_btree_new,
|
||||
unwrap_infallible,
|
||||
min_type_alias_impl_trait,
|
||||
|
||||
@ -111,7 +111,7 @@ impl DirEntry {
|
||||
},
|
||||
Err(err) => Some(Err(ReadDirError::ParseEntry(err))),
|
||||
})
|
||||
.flat_map(Result::transpose)
|
||||
.filter_map(Result::transpose)
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
|
||||
Ok(Dir::new(dirs))
|
||||
|
||||
@ -230,8 +230,8 @@ impl Bytes for Digimon {
|
||||
let (mut speciality_byte, mut level_byte) = (0u8, 0u8);
|
||||
|
||||
// Note: Buffers have 1 byte, so this can't fail
|
||||
self.speciality.to_bytes(&mut speciality_byte)?;
|
||||
self.level.to_bytes(&mut level_byte)?;
|
||||
self.speciality.to_bytes(&mut speciality_byte).into_ok();
|
||||
self.level.to_bytes(&mut level_byte).into_ok();
|
||||
|
||||
// Merge them
|
||||
*bytes.speciality_level = (speciality_byte << 4u8) | level_byte;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user