Skip to content

Commit 8b67b04

Browse files
mstangemstange
committed
cargo fmt
1 parent a9633d1 commit 8b67b04

File tree

1 file changed

+77
-45
lines changed

1 file changed

+77
-45
lines changed

‎wholesym/src/helper.rs

Lines changed: 77 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -955,14 +955,18 @@ impl HelperDownloaderObserver {
955955

956956
pub fn on_file_accessed(&self, path: &Path) {
957957
let inner = self.inner.lock().unwrap();
958-
let Some(observer) = inner.observer.clone() else { return };
958+
let Some(observer) = inner.observer.clone() else {
959+
return;
960+
};
959961
drop(inner);
960962
observer.on_file_accessed(path);
961963
}
962964

963965
pub fn on_file_missed(&self, path: &Path) {
964966
let inner = self.inner.lock().unwrap();
965-
let Some(observer) = inner.observer.clone() else { return };
967+
let Some(observer) = inner.observer.clone() else {
968+
return;
969+
};
966970
drop(inner);
967971
observer.on_file_missed(path);
968972
}
@@ -977,14 +981,18 @@ impl SymsrvObserver for HelperDownloaderObserver {
977981
inner
978982
.symsrv_download_id_mapping
979983
.insert(symsrv_download_id, download_id);
980-
let Some(observer) = inner.observer.clone() else { return };
984+
let Some(observer) = inner.observer.clone() else {
985+
return;
986+
};
981987
drop(inner);
982988
observer.on_new_download_before_connect(download_id, url);
983989
}
984990

985991
fn on_download_started(&self, symsrv_download_id: u64) {
986992
let inner = self.inner.lock().unwrap();
987-
let Some(observer) = inner.observer.clone() else { return };
993+
let Some(observer) = inner.observer.clone() else {
994+
return;
995+
};
988996
let download_id = inner.symsrv_download_id_mapping[&symsrv_download_id];
989997
drop(inner);
990998
observer.on_download_started(download_id);
@@ -997,7 +1005,9 @@ impl SymsrvObserver for HelperDownloaderObserver {
9971005
total_bytes: Option<u64>,
9981006
) {
9991007
let inner = self.inner.lock().unwrap();
1000-
let Some(observer) = inner.observer.clone() else { return };
1008+
let Some(observer) = inner.observer.clone() else {
1009+
return;
1010+
};
10011011
let download_id = inner.symsrv_download_id_mapping[&symsrv_download_id];
10021012
drop(inner);
10031013
observer.on_download_progress(download_id, bytes_so_far, total_bytes);
@@ -1015,14 +1025,16 @@ impl SymsrvObserver for HelperDownloaderObserver {
10151025
.symsrv_download_id_mapping
10161026
.remove(&symsrv_download_id)
10171027
.unwrap();
1018-
let Some(observer) = inner.observer.clone() else { return };
1028+
let Some(observer) = inner.observer.clone() else {
1029+
return;
1030+
};
10191031
drop(inner);
1020-
observer.on_download_completed(
1021-
download_id,
1022-
uncompressed_size_in_bytes,
1023-
time_until_headers,
1024-
time_until_completed,
1025-
);
1032+
observer.on_download_completed(
1033+
download_id,
1034+
uncompressed_size_in_bytes,
1035+
time_until_headers,
1036+
time_until_completed,
1037+
);
10261038
}
10271039

10281040
fn on_download_failed(&self, symsrv_download_id: u64, reason: symsrv::DownloadError) {
@@ -1031,31 +1043,33 @@ impl SymsrvObserver for HelperDownloaderObserver {
10311043
.symsrv_download_id_mapping
10321044
.remove(&symsrv_download_id)
10331045
.unwrap();
1034-
let Some(observer) = inner.observer.clone() else { return };
1046+
let Some(observer) = inner.observer.clone() else {
1047+
return;
1048+
};
10351049
drop(inner);
1036-
let err = match reason {
1037-
symsrv::DownloadError::ClientCreationFailed(e) => {
1038-
DownloadError::ClientCreationFailed(e)
1039-
}
1040-
symsrv::DownloadError::OpenFailed(e) => DownloadError::OpenFailed(e),
1041-
symsrv::DownloadError::Timeout => DownloadError::Timeout,
1042-
symsrv::DownloadError::StatusError(status_code) => {
1043-
DownloadError::StatusError(status_code.as_u16())
1044-
}
1045-
symsrv::DownloadError::CouldNotCreateDestinationDirectory => {
1046-
DownloadError::CouldNotCreateDestinationDirectory
1047-
}
1048-
symsrv::DownloadError::UnexpectedContentEncoding(e) => {
1049-
DownloadError::UnexpectedContentEncoding(e)
1050-
}
1051-
symsrv::DownloadError::ErrorDuringDownloading(e) => DownloadError::StreamRead(e),
1052-
symsrv::DownloadError::ErrorWhileWritingDownloadedFile(e) => {
1053-
DownloadError::DiskWrite(e)
1054-
}
1055-
symsrv::DownloadError::Redirect(e) => DownloadError::Redirect(e),
1056-
symsrv::DownloadError::Other(e) => DownloadError::Other(e),
1057-
};
1058-
observer.on_download_failed(download_id, err);
1050+
let err = match reason {
1051+
symsrv::DownloadError::ClientCreationFailed(e) => {
1052+
DownloadError::ClientCreationFailed(e)
1053+
}
1054+
symsrv::DownloadError::OpenFailed(e) => DownloadError::OpenFailed(e),
1055+
symsrv::DownloadError::Timeout => DownloadError::Timeout,
1056+
symsrv::DownloadError::StatusError(status_code) => {
1057+
DownloadError::StatusError(status_code.as_u16())
1058+
}
1059+
symsrv::DownloadError::CouldNotCreateDestinationDirectory => {
1060+
DownloadError::CouldNotCreateDestinationDirectory
1061+
}
1062+
symsrv::DownloadError::UnexpectedContentEncoding(e) => {
1063+
DownloadError::UnexpectedContentEncoding(e)
1064+
}
1065+
symsrv::DownloadError::ErrorDuringDownloading(e) => DownloadError::StreamRead(e),
1066+
symsrv::DownloadError::ErrorWhileWritingDownloadedFile(e) => {
1067+
DownloadError::DiskWrite(e)
1068+
}
1069+
symsrv::DownloadError::Redirect(e) => DownloadError::Redirect(e),
1070+
symsrv::DownloadError::Other(e) => DownloadError::Other(e),
1071+
};
1072+
observer.on_download_failed(download_id, err);
10591073
}
10601074

10611075
fn on_download_canceled(&self, symsrv_download_id: u64) {
@@ -1064,7 +1078,9 @@ impl SymsrvObserver for HelperDownloaderObserver {
10641078
.symsrv_download_id_mapping
10651079
.remove(&symsrv_download_id)
10661080
.unwrap();
1067-
let Some(observer) = inner.observer.clone() else { return };
1081+
let Some(observer) = inner.observer.clone() else {
1082+
return;
1083+
};
10681084
drop(inner);
10691085
observer.on_download_canceled(download_id);
10701086
}
@@ -1089,7 +1105,9 @@ impl SymsrvObserver for HelperDownloaderObserver {
10891105

10901106
fn on_file_created(&self, path: &Path, size_in_bytes: u64) {
10911107
let inner = self.inner.lock().unwrap();
1092-
let Some(observer) = inner.observer.clone() else { return };
1108+
let Some(observer) = inner.observer.clone() else {
1109+
return;
1110+
};
10931111
drop(inner);
10941112
observer.on_file_created(path, size_in_bytes);
10951113
}
@@ -1110,14 +1128,18 @@ impl DownloaderObserver for HelperDownloaderObserver {
11101128
inner
11111129
.downloader_download_id_mapping
11121130
.insert(downloader_download_id, download_id);
1113-
let Some(observer) = inner.observer.clone() else { return };
1131+
let Some(observer) = inner.observer.clone() else {
1132+
return;
1133+
};
11141134
drop(inner);
11151135
observer.on_new_download_before_connect(download_id, url);
11161136
}
11171137

11181138
fn on_download_started(&self, downloader_download_id: u64) {
11191139
let inner = self.inner.lock().unwrap();
1120-
let Some(observer) = inner.observer.clone() else { return };
1140+
let Some(observer) = inner.observer.clone() else {
1141+
return;
1142+
};
11211143
let download_id = inner.downloader_download_id_mapping[&downloader_download_id];
11221144
drop(inner);
11231145
observer.on_download_started(download_id);
@@ -1130,7 +1152,9 @@ impl DownloaderObserver for HelperDownloaderObserver {
11301152
total_bytes: Option<u64>,
11311153
) {
11321154
let inner = self.inner.lock().unwrap();
1133-
let Some(observer) = inner.observer.clone() else { return };
1155+
let Some(observer) = inner.observer.clone() else {
1156+
return;
1157+
};
11341158
let download_id = inner.downloader_download_id_mapping[&downloader_download_id];
11351159
drop(inner);
11361160
observer.on_download_progress(download_id, bytes_so_far, total_bytes);
@@ -1148,7 +1172,9 @@ impl DownloaderObserver for HelperDownloaderObserver {
11481172
.downloader_download_id_mapping
11491173
.remove(&downloader_download_id)
11501174
.unwrap();
1151-
let Some(observer) = inner.observer.clone() else { return };
1175+
let Some(observer) = inner.observer.clone() else {
1176+
return;
1177+
};
11521178
drop(inner);
11531179
observer.on_download_completed(
11541180
download_id,
@@ -1164,7 +1190,9 @@ impl DownloaderObserver for HelperDownloaderObserver {
11641190
.downloader_download_id_mapping
11651191
.remove(&downloader_download_id)
11661192
.unwrap();
1167-
let Some(observer) = inner.observer.clone() else { return };
1193+
let Some(observer) = inner.observer.clone() else {
1194+
return;
1195+
};
11681196
drop(inner);
11691197
observer.on_download_failed(download_id, reason);
11701198
}
@@ -1175,14 +1203,18 @@ impl DownloaderObserver for HelperDownloaderObserver {
11751203
.downloader_download_id_mapping
11761204
.remove(&downloader_download_id)
11771205
.unwrap();
1178-
let Some(observer) = inner.observer.clone() else { return };
1206+
let Some(observer) = inner.observer.clone() else {
1207+
return;
1208+
};
11791209
drop(inner);
11801210
observer.on_download_canceled(download_id);
11811211
}
11821212

11831213
fn on_file_created(&self, path: &Path, size_in_bytes: u64) {
11841214
let inner = self.inner.lock().unwrap();
1185-
let Some(observer) = inner.observer.clone() else { return };
1215+
let Some(observer) = inner.observer.clone() else {
1216+
return;
1217+
};
11861218
drop(inner);
11871219
observer.on_file_created(path, size_in_bytes);
11881220
}

0 commit comments

Comments
 (0)