majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: enforce some more clippy lints

Browse Source 
pumpkin contributors will love me :cap:
This commit is contained in:
Alexander Medvedev
2026-05-20 22:27:54 +02:00
parent 4ad5b2ba03
commit 2fcc9bcf4a
104 changed files with 3891 additions and 3567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pumpkin-codecs/src/data_result.rs
View File

@@ -572,30 +572,23 @@ impl<R> DataResult<R> {
///
/// The [`Lifecycle`] of the returned `DataResult` is the addition of both results.
pub fn with_errors_from<T>(self, result: &DataResult<T>) -> Self {
match (&self, result) {
// If both values are successes, do nothing.
// If `self` is already an error result, do nothing.
(Self::Success { .. }, DataResult::Success { .. }) | (Self::Error { .. }, _) => self,
let current_lifecycle = self.lifecycle();
match (self, result) {
(s @ Self::Error { .. }, _) | (s, DataResult::Success { .. }) => s,
(
Self::Success { .. },
Self::Success { result: val, .. },
DataResult::Error {
message,
lifecycle: other_lifecycle,
..
},
) => {
let self_lifecycle = self.lifecycle();
if let Self::Success { result, .. } = self {
Self::new_partial_error_with_lifecycle(
message.clone(),
result,
self_lifecycle.add(*other_lifecycle),
)
} else {
unreachable!()
}
}
) => Self::new_partial_error_with_lifecycle(
message.clone(),
val,
current_lifecycle.add(*other_lifecycle),
),
}
}