diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
| commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
| tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/gix-index/src/decode/mod.rs | |
| parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
| download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip | |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-index/src/decode/mod.rs')
| -rw-r--r-- | vendor/gix-index/src/decode/mod.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vendor/gix-index/src/decode/mod.rs b/vendor/gix-index/src/decode/mod.rs index c94b03495..f51a5d5e9 100644 --- a/vendor/gix-index/src/decode/mod.rs +++ b/vendor/gix-index/src/decode/mod.rs @@ -10,7 +10,7 @@ mod error { use crate::{decode, extension}; - /// The error returned by [State::from_bytes()][crate::State::from_bytes()]. + /// The error returned by [`State::from_bytes()`][crate::State::from_bytes()]. #[derive(Debug, thiserror::Error)] #[allow(missing_docs)] pub enum Error { @@ -183,9 +183,10 @@ impl State { version, ), }; - let ext_res = extension_loading - .map(|thread| thread.join().unwrap()) - .unwrap_or_else(|| extension::decode::all(extensions_data, object_hash)); + let ext_res = extension_loading.map_or_else( + || extension::decode::all(extensions_data, object_hash), + |thread| thread.join().unwrap(), + ); (entries_res, ext_res) }); let (ext, data) = ext_res?; |