From ae3057258543e6d0a4d7c27b300bc08acbd7812f Mon Sep 17 00:00:00 2001 From: Brooks Date: Sun, 12 Nov 2023 00:01:17 -0500 Subject: [PATCH] Use AtomicAppendVecId type alias in verify_and_unarchive_snapshot() (#34019) --- runtime/src/snapshot_utils.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs index 9daaa0f6831fa8..c890c3196f936d 100644 --- a/runtime/src/snapshot_utils.rs +++ b/runtime/src/snapshot_utils.rs @@ -36,7 +36,7 @@ use { path::{Path, PathBuf}, process::ExitStatus, str::FromStr, - sync::{atomic::AtomicU32, Arc, Mutex}, + sync::{Arc, Mutex}, thread::{Builder, JoinHandle}, }, tar::{self, Archive}, @@ -1234,7 +1234,11 @@ pub fn verify_and_unarchive_snapshots( full_snapshot_archive_info: &FullSnapshotArchiveInfo, incremental_snapshot_archive_info: Option<&IncrementalSnapshotArchiveInfo>, account_paths: &[PathBuf], -) -> Result<(UnarchivedSnapshot, Option, AtomicU32)> { +) -> Result<( + UnarchivedSnapshot, + Option, + AtomicAppendVecId, +)> { check_are_snapshots_compatible( full_snapshot_archive_info, incremental_snapshot_archive_info,