Skip to content

Commit 2570950

Browse files
gepbirdtrumank
gepbird
authored and
trumank
committed
Format with rustfmt
1 parent 4d8c3e9 commit 2570950

File tree

7 files changed

+104
-94
lines changed

7 files changed

+104
-94
lines changed

‎src/gui/message.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,10 @@ pub struct FetchModProgress {
243243
impl FetchModProgress {
244244
fn receive(self, app: &mut App) {
245245
if let Some(MessageHandle { rid, state, .. }) = &mut app.integrate_rid
246-
&& *rid == self.rid {
247-
state.insert(self.spec, self.progress);
248-
}
246+
&& *rid == self.rid
247+
{
248+
state.insert(self.spec, self.progress);
249+
}
249250
}
250251
}
251252

@@ -338,11 +339,11 @@ impl CheckUpdates {
338339
.tag_name
339340
.strip_prefix('v')
340341
.map(semver::Version::parse),
341-
)
342-
&& release_version > version {
343-
app.available_update = Some(release);
344-
app.show_update_time = Some(SystemTime::now());
345-
}
342+
) && release_version > version
343+
{
344+
app.available_update = Some(release);
345+
app.show_update_time = Some(SystemTime::now());
346+
}
346347
}
347348
Err(e) => tracing::warn!("failed to fetch update {e}"),
348349
}
@@ -593,9 +594,10 @@ pub struct FetchSelfUpdateProgress {
593594
impl FetchSelfUpdateProgress {
594595
fn receive(self, app: &mut App) {
595596
if let Some(MessageHandle { rid, state, .. }) = &mut app.self_update_rid
596-
&& *rid == self.rid {
597-
*state = self.progress;
598-
}
597+
&& *rid == self.rid
598+
{
599+
*state = self.progress;
600+
}
599601
}
600602
}
601603

‎src/gui/mod.rs‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -457,23 +457,24 @@ impl App {
457457
}
458458

459459
if mc.enabled
460-
&& let Some(req) = &self.integrate_rid {
461-
match req.state.get(&mc.spec) {
462-
Some(SpecFetchProgress::Progress { progress, size }) => {
463-
ui.add(
464-
egui::ProgressBar::new(*progress as f32 / *size as f32)
465-
.show_percentage()
466-
.desired_width(100.0),
467-
);
468-
}
469-
Some(SpecFetchProgress::Complete) => {
470-
ui.add(egui::ProgressBar::new(1.0).desired_width(100.0));
471-
}
472-
None => {
473-
ui.spinner();
474-
}
460+
&& let Some(req) = &self.integrate_rid
461+
{
462+
match req.state.get(&mc.spec) {
463+
Some(SpecFetchProgress::Progress { progress, size }) => {
464+
ui.add(
465+
egui::ProgressBar::new(*progress as f32 / *size as f32)
466+
.show_percentage()
467+
.desired_width(100.0),
468+
);
469+
}
470+
Some(SpecFetchProgress::Complete) => {
471+
ui.add(egui::ProgressBar::new(1.0).desired_width(100.0));
472+
}
473+
None => {
474+
ui.spinner();
475475
}
476476
}
477+
}
477478

478479
if let Some(info) = &info {
479480
egui::ComboBox::from_id_salt(row_index)
@@ -1736,18 +1737,18 @@ impl eframe::App for App {
17361737
}
17371738
})
17381739
.clicked()
1739-
{
1740-
let args = args.clone();
1741-
std::thread::spawn(move || {
1742-
let mut iter = args.iter();
1743-
std::process::Command::new(iter.next().unwrap())
1744-
.args(iter)
1745-
.spawn()
1746-
.unwrap()
1747-
.wait()
1748-
.unwrap();
1749-
});
1750-
}
1740+
{
1741+
let args = args.clone();
1742+
std::thread::spawn(move || {
1743+
let mut iter = args.iter();
1744+
std::process::Command::new(iter.next().unwrap())
1745+
.args(iter)
1746+
.spawn()
1747+
.unwrap()
1748+
.wait()
1749+
.unwrap();
1750+
});
1751+
}
17511752

17521753
ui.add_enabled_ui(self.state.config.drg_pak_path.is_some(), |ui| {
17531754
let mut button = ui.button("Install mods");
@@ -1868,10 +1869,10 @@ impl eframe::App for App {
18681869
available_update.tag_name, available_update.html_url
18691870
))
18701871
.clicked()
1871-
{
1872-
ui.ctx()
1873-
.open_url(egui::OpenUrl::new_tab(&available_update.html_url));
1874-
}
1872+
{
1873+
ui.ctx()
1874+
.open_url(egui::OpenUrl::new_tab(&available_update.html_url));
1875+
}
18751876
ui.with_layout(egui::Layout::left_to_right(Align::TOP), |ui| {
18761877
if let Some(last_action) = &self.last_action {
18771878
let msg = match &last_action.status {

‎src/integrate.rs‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -859,9 +859,9 @@ fn hook_pcb<R: Read + Seek>(asset: &mut Asset<R>) {
859859
.get_base_export()
860860
.object_name
861861
.get_content(|n| n == "ReceiveBeginPlay")
862-
{
863-
return Some((PackageIndex::from_export(i as i32).unwrap(), func));
864-
}
862+
{
863+
return Some((PackageIndex::from_export(i as i32).unwrap(), func));
864+
}
865865
None
866866
})
867867
.unwrap();
@@ -1065,9 +1065,10 @@ fn patch<C: Seek + Read>(asset: &mut Asset<C>) -> Result<(), IntegrationError> {
10651065
) -> Option<TrackedStatement> {
10661066
walk(&mut statement.ex, &|ex| {
10671067
if let KismetExpression::ExCallMath(f) = ex
1068-
&& (Some(f.stack_node) == is_modded || Some(f.stack_node) == is_modded_sandbox) {
1069-
*ex = ExFalse::default().into()
1070-
}
1068+
&& (Some(f.stack_node) == is_modded || Some(f.stack_node) == is_modded_sandbox)
1069+
{
1070+
*ex = ExFalse::default().into()
1071+
}
10711072
});
10721073
Some(statement)
10731074
}
@@ -1093,12 +1094,13 @@ fn patch_modding_tab<C: Seek + Read>(asset: &mut Asset<C>) -> Result<(), Integra
10931094
for statement in statements {
10941095
walk(&mut statement.ex, &|ex| {
10951096
if let KismetExpression::ExSetArray(arr) = ex
1096-
&& arr.elements.len() == 2 {
1097-
arr.elements.retain(|e| !matches!(e, KismetExpression::ExInstanceVariable(v) if v.variable.new.as_ref().unwrap().path.last().unwrap().get_content(|c| c == "BTN_Modding")));
1098-
if arr.elements.len() != 2 {
1099-
info!("patched modding tab visibility");
1100-
}
1097+
&& arr.elements.len() == 2
1098+
{
1099+
arr.elements.retain(|e| !matches!(e, KismetExpression::ExInstanceVariable(v) if v.variable.new.as_ref().unwrap().path.last().unwrap().get_content(|c| c == "BTN_Modding")));
1100+
if arr.elements.len() != 2 {
1101+
info!("patched modding tab visibility");
11011102
}
1103+
}
11021104
});
11031105
}
11041106
}

‎src/mod_lints/asset_register_bin.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ impl Lint for AssetRegisterBinLint {
1515

1616
lcx.for_each_mod_file(|mod_spec, _, _, raw_path, normalized_path| {
1717
if let Some(filename) = raw_path.file_name()
18-
&& filename == "AssetRegistry.bin" {
19-
asset_register_bin_mods
20-
.entry(mod_spec.clone())
21-
.and_modify(|paths: &mut BTreeSet<String>| {
22-
paths.insert(normalized_path.clone());
23-
})
24-
.or_insert_with(|| [normalized_path.clone()].into());
25-
}
18+
&& filename == "AssetRegistry.bin"
19+
{
20+
asset_register_bin_mods
21+
.entry(mod_spec.clone())
22+
.and_modify(|paths: &mut BTreeSet<String>| {
23+
paths.insert(normalized_path.clone());
24+
})
25+
.or_insert_with(|| [normalized_path.clone()].into());
26+
}
2627

2728
Ok(())
2829
})?;

‎src/mod_lints/mod.rs‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ impl LintCtxt {
107107
.collect::<Vec<_>>();
108108

109109
if individual_pak_readers.len() > 1
110-
&& let Some(ref mut handler) = multiple_pak_files_handler {
111-
handler(mod_spec.clone());
112-
}
110+
&& let Some(ref mut handler) = multiple_pak_files_handler
111+
{
112+
handler(mod_spec.clone());
113+
}
113114

114115
let mut first_pak_read_seek = individual_pak_readers.remove(0);
115116
let pak_reader = repak::PakBuilder::new().reader(&mut first_pak_read_seek)?;
@@ -173,20 +174,21 @@ pub(crate) fn lint_get_all_files_from_data(
173174
.map_err(|_| LintError::ZipArchiveError)?;
174175

175176
if let Some(p) = file.enclosed_name().as_deref().map(Path::to_path_buf)
176-
&& file.is_file() {
177-
if p.extension().filter(|e| e == &"pak").is_some() {
178-
let mut buf = vec![];
179-
file.read_to_end(&mut buf)?;
180-
files.push((
181-
p.to_path_buf(),
182-
PakOrNotPak::Pak(Box::new(Cursor::new(buf))),
183-
));
184-
} else {
185-
let mut buf = vec![];
186-
file.read_to_end(&mut buf)?;
187-
files.push((p.to_path_buf(), PakOrNotPak::NotPak));
188-
}
177+
&& file.is_file()
178+
{
179+
if p.extension().filter(|e| e == &"pak").is_some() {
180+
let mut buf = vec![];
181+
file.read_to_end(&mut buf)?;
182+
files.push((
183+
p.to_path_buf(),
184+
PakOrNotPak::Pak(Box::new(Cursor::new(buf))),
185+
));
186+
} else {
187+
let mut buf = vec![];
188+
file.read_to_end(&mut buf)?;
189+
files.push((p.to_path_buf(), PakOrNotPak::NotPak));
189190
}
191+
}
190192
}
191193

192194
if files

‎src/providers/http.rs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,16 @@ impl ModProvider for HttpProvider {
172172
url: url.0.to_string(),
173173
})?;
174174
if let Some(size) = size
175-
&& let Some(tx) = &tx {
176-
tx.send(FetchProgress::Progress {
177-
resolution: res.clone(),
178-
progress: cursor.get_ref().len() as u64,
179-
size,
180-
})
181-
.await
182-
.unwrap();
183-
}
175+
&& let Some(tx) = &tx
176+
{
177+
tx.send(FetchProgress::Progress {
178+
resolution: res.clone(),
179+
progress: cursor.get_ref().len() as u64,
180+
size,
181+
})
182+
.await
183+
.unwrap();
184+
}
184185
}
185186

186187
let blob = blob_cache.write(&cursor.into_inner())?;

‎src/providers/modio.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,15 @@ impl Middleware for LoggingMiddleware {
168168
);
169169
let res = next.clone().run(req.try_clone().unwrap(), extensions).await;
170170
if let Ok(res) = &res
171-
&& let Some(retry) = res.headers().get("retry-after") {
172-
info!("retrying after: {}...", retry.to_str().unwrap());
173-
tokio::time::sleep(tokio::time::Duration::from_secs(
174-
retry.to_str().unwrap().parse::<u64>().unwrap(),
175-
))
176-
.await;
177-
continue;
178-
}
171+
&& let Some(retry) = res.headers().get("retry-after")
172+
{
173+
info!("retrying after: {}...", retry.to_str().unwrap());
174+
tokio::time::sleep(tokio::time::Duration::from_secs(
175+
retry.to_str().unwrap().parse::<u64>().unwrap(),
176+
))
177+
.await;
178+
continue;
179+
}
179180
return res;
180181
}
181182
}

0 commit comments

Comments
 (0)