Skip to content

Commit 5063a48

Browse files
FrostyCoolSlugFrostyCoolSlug
committed
Clippy out here attacking all my format!s :(
1 parent 865a6c6 commit 5063a48

File tree

10 files changed

+32
-38
lines changed

10 files changed

+32
-38
lines changed

‎client/src/runner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub async fn run_cli() -> Result<()> {
3232
let mut client: Box<dyn Client>;
3333

3434
if let Some(url) = cli.use_http {
35-
client = Box::new(WebClient::new(format!("{}/api/command", url)));
35+
client = Box::new(WebClient::new(format!("{url}/api/command")));
3636
} else {
3737
// Windows supports unix sockets now, but we want to maintain the historic behaviour
3838
// so we'll force it to a NameSpace here..

‎daemon/src/device.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ impl<'a> Device<'a> {
799799
self.apply_effects(LinkedHashSet::from_iter([EffectKey::MicInputMute]))?;
800800
}
801801

802-
let message = format!("Mic Muted{}", target);
802+
let message = format!("Mic Muted{target}");
803803
let _ = self.global_events.send(TTSMessage(message)).await;
804804

805805
self.apply_routing(BasicInputDevice::Microphone).await?;
@@ -858,7 +858,7 @@ impl<'a> Device<'a> {
858858
self.apply_effects(LinkedHashSet::from_iter([EffectKey::MicInputMute]))?;
859859
}
860860

861-
let message = format!("Mic Muted{}", target);
861+
let message = format!("Mic Muted{target}");
862862
let _ = self.global_events.send(TTSMessage(message)).await;
863863

864864
// Update the transient routing..
@@ -903,7 +903,7 @@ impl<'a> Device<'a> {
903903

904904
// Ok, we need to announce where we're muted to..
905905
let name = self.profile.get_fader_assignment(fader);
906-
let message = format!("{} Muted{}", name, target);
906+
let message = format!("{name} Muted{target}");
907907
let _ = self.global_events.send(TTSMessage(message)).await;
908908

909909
let input = self.get_basic_input_from_channel(channel);
@@ -956,7 +956,7 @@ impl<'a> Device<'a> {
956956
}
957957

958958
let name = self.profile.get_fader_assignment(fader);
959-
let message = format!("{} Muted", name);
959+
let message = format!("{name} Muted");
960960
let _ = self.global_events.send(TTSMessage(message)).await;
961961

962962
if blink {
@@ -1055,7 +1055,7 @@ impl<'a> Device<'a> {
10551055
}
10561056

10571057
let name = self.profile.get_fader_assignment(fader);
1058-
let message = format!("{} unmuted", name);
1058+
let message = format!("{name} unmuted");
10591059
let _ = self.global_events.send(TTSMessage(message)).await;
10601060

10611061
self.update_button_states()?;
@@ -1125,7 +1125,7 @@ impl<'a> Device<'a> {
11251125

11261126
async fn load_sample_bank(&mut self, bank: SampleBank) -> Result<()> {
11271127
// Send the TTS Message..
1128-
let tts_message = format!("Sample {}", bank);
1128+
let tts_message = format!("Sample {bank}");
11291129
let _ = self.global_events.send(TTSMessage(tts_message)).await;
11301130

11311131
self.profile.load_sample_bank(bank)?;
@@ -1666,7 +1666,7 @@ impl<'a> Device<'a> {
16661666
.get_effect_value(EffectKey::PitchAmount, self.profile());
16671667

16681668
if !self.is_device_mini() {
1669-
let message = format!("Pitch {}", user_value);
1669+
let message = format!("Pitch {user_value}");
16701670
let _ = self.global_events.send(TTSMessage(message)).await;
16711671
}
16721672
}
@@ -1693,7 +1693,7 @@ impl<'a> Device<'a> {
16931693
self.apply_effects(LinkedHashSet::from_iter([EffectKey::GenderAmount]))?;
16941694

16951695
if !self.is_device_mini() {
1696-
let message = format!("Gender {}", new_value);
1696+
let message = format!("Gender {new_value}");
16971697
let _ = self.global_events.send(TTSMessage(message)).await;
16981698
}
16991699
}
@@ -1718,7 +1718,7 @@ impl<'a> Device<'a> {
17181718
let percent = 100 - ((new_value as f32 / -36.) * 100.) as i32;
17191719

17201720
if !self.is_device_mini() {
1721-
let message = format!("Reverb {} percent", percent);
1721+
let message = format!("Reverb {percent} percent");
17221722
let _ = self.global_events.send(TTSMessage(message)).await;
17231723
}
17241724
}
@@ -1739,7 +1739,7 @@ impl<'a> Device<'a> {
17391739
user_value = 100 - ((user_value as f32 / -36.) * 100.) as i32;
17401740

17411741
if !self.is_device_mini() {
1742-
let message = format!("Echo {} percent", user_value);
1742+
let message = format!("Echo {user_value} percent");
17431743
let _ = self.global_events.send(TTSMessage(message)).await;
17441744
}
17451745
}

‎daemon/src/firmware/firmware_update.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub async fn do_firmware_update(settings: FirmwareUpdateSettings, file_info: Fir
9797
let firmware = match fs::read(file_info.path) {
9898
Ok(bytes) => bytes,
9999
Err(e) => {
100-
let error = format!("Unable to load firmware from disk: {}", e);
100+
let error = format!("Unable to load firmware from disk: {e}");
101101
send_error(&device.serial, sender, error).await;
102102
return;
103103
}

‎daemon/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ async fn main() -> Result<()> {
112112
}
113113

114114
// Message is Cross-Platform now :)
115-
let message = format!("Error Starting the GoXLR Utility:\r\n\r\n{}", e);
115+
let message = format!("Error Starting the GoXLR Utility:\r\n\r\n{e}");
116116
platform::display_error(message);
117117

118118
// Kill the process with an error to ensure the entire runtime is stopped

‎daemon/src/platform/linux/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn display_error(message: String) {
1111
.arg(message.clone())
1212
.output()
1313
{
14-
println!("Error Running kdialog: {}, falling back to zenity..", e);
14+
println!("Error Running kdialog: {e}, falling back to zenity..");
1515
let _ = Command::new("zenity")
1616
.arg("--title")
1717
.arg("GoXLR Utility")

‎daemon/src/profile.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub struct ProfileAdapter {
6262

6363
impl ProfileAdapter {
6464
pub fn from_named(name: String, directory: &Path) -> Result<Self> {
65-
let path = directory.join(format!("{}.goxlr", name));
65+
let path = directory.join(format!("{name}.goxlr"));
6666

6767
if path.is_file() {
6868
debug!("Loading Profile From {}", path.to_string_lossy());

‎daemon/src/servers/http_server.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,22 +470,21 @@ async fn upload_firmware(
470470
app_data: Data<Mutex<AppData>>,
471471
) -> HttpResponse {
472472
let serial = path.into_inner();
473-
let file_path = env::temp_dir().join(format!("{}.bin", serial));
473+
let file_path = env::temp_dir().join(format!("{serial}.bin"));
474474

475475
let mut field = match payload.next().await {
476476
Some(Ok(field)) => field,
477477
Some(Err(e)) => {
478478
return HttpResponse::InternalServerError()
479-
.body(format!("Error processing multipart: {}", e))
479+
.body(format!("Error processing multipart: {e}"))
480480
}
481481
None => return HttpResponse::BadRequest().body("No file found in request"),
482482
};
483483

484484
let mut file = match File::create(&file_path) {
485485
Ok(f) => f,
486486
Err(e) => {
487-
return HttpResponse::InternalServerError()
488-
.body(format!("Failed to create file: {}", e))
487+
return HttpResponse::InternalServerError().body(format!("Failed to create file: {e}"))
489488
}
490489
};
491490

@@ -494,12 +493,12 @@ async fn upload_firmware(
494493
Ok(data) => {
495494
if let Err(e) = file.write_all(&data) {
496495
return HttpResponse::InternalServerError()
497-
.body(format!("Failed to write file: {}", e));
496+
.body(format!("Failed to write file: {e}"));
498497
}
499498
}
500499
Err(e) => {
501500
return HttpResponse::InternalServerError()
502-
.body(format!("Error reading file chunk: {}", e))
501+
.body(format!("Error reading file chunk: {e}"))
503502
}
504503
}
505504
}
@@ -521,7 +520,7 @@ async fn upload_firmware(
521520
let result = rx.await;
522521
match result {
523522
Ok(_) => HttpResponse::Ok().body(serde_json::to_string(&DaemonResponse::Ok).unwrap()),
524-
Err(e) => HttpResponse::InternalServerError().body(format!("Error Occurred: {}", e)),
523+
Err(e) => HttpResponse::InternalServerError().body(format!("Error Occurred: {e}")),
525524
}
526525
}
527526

‎daemon/src/settings.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ impl Settings {
737737
backup.set_extension(".failed");
738738

739739
let copy_result = fs::copy(path, backup);
740-
println!("{:?}", copy_result);
740+
println!("{copy_result:?}");
741741

742742
println!("Error Loading configuration, loading defaults.");
743743
Ok(None)

‎defaults/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ fn main() -> Result<(), Errors> {
4646
if !args.overwrite {
4747
continue;
4848
} else if let Err(e) = fs::remove_file(&file_path) {
49-
eprintln!("Error Removing File: {}", e);
49+
eprintln!("Error Removing File: {e}");
5050
return Err(Errors::ErrorRemovingFile);
5151
}
5252
}
5353

5454
if let Err(e) = fs::write(&file_path, file.contents()) {
55-
eprintln!("Error Writing File: {}", e);
55+
eprintln!("Error Writing File: {e}");
5656
return Err(Errors::ErrorWritingFile);
5757
}
5858
}

‎profile/src/components/scribble.rs‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,33 +144,28 @@ impl Scribble {
144144

145145
let mut attributes: HashMap<String, String> = HashMap::default();
146146
attributes.insert(
147-
format!("{}iconFile", element_name),
147+
format!("{element_name}iconFile"),
148148
if self.icon_file.is_none() {
149149
"".to_string()
150150
} else {
151151
self.icon_file.clone().unwrap()
152152
},
153153
);
154+
attributes.insert(format!("{element_name}string0"), self.text_top_left.clone());
154155
attributes.insert(
155-
format!("{}string0", element_name),
156-
self.text_top_left.clone(),
157-
);
158-
attributes.insert(
159-
format!("{}string1", element_name),
156+
format!("{element_name}string1"),
160157
self.text_bottom_middle.clone(),
161158
);
162-
attributes.insert(format!("{}alpha", element_name), format!("{}", self.alpha));
159+
attributes.insert(format!("{element_name}alpha"), format!("{}", self.alpha));
163160
attributes.insert(
164-
format!("{}inverted", element_name),
165-
if self.style == Normal { "0" } else { "1" }
166-
.parse()
167-
.unwrap(),
161+
format!("{element_name}inverted"),
162+
if self.style == Normal { "0" } else { "1" }.parse()?,
168163
);
169164
attributes.insert(
170-
format!("{}textSize", element_name),
165+
format!("{element_name}textSize"),
171166
format!("{}", self.text_size),
172167
);
173-
attributes.insert(format!("{}bitmap", element_name), self.bitmap_file.clone());
168+
attributes.insert(format!("{element_name}bitmap"), self.bitmap_file.clone());
174169

175170
self.colour_map
176171
.write_colours_with_prefix(element_name.into(), &mut attributes);

0 commit comments

Comments
 (0)