Skip to content

Commit d37a498

Browse files
authored
Use Display for errors (#1007)
* Lint against formatting errors using Debug `{:?}` * Use Display for errors * Lint to use consistent `err` as name for errors
1 parent 6a41db6 commit d37a498

File tree

26 files changed

+62
-42
lines changed

26 files changed

+62
-42
lines changed

crates/re_sdk_comms/src/server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn serve(
4646
spawn_client(stream, tx, options);
4747
}
4848
Err(err) => {
49-
re_log::warn!("Failed to accept incoming SDK client: {err:?}");
49+
re_log::warn!("Failed to accept incoming SDK client: {err}");
5050
}
5151
}
5252
}
@@ -66,7 +66,7 @@ fn spawn_client(stream: std::net::TcpStream, tx: Sender<LogMsg>, options: Server
6666
re_log::info!("New SDK client connected: {:?}", stream.peer_addr());
6767

6868
if let Err(err) = run_client(stream, &tx, options) {
69-
re_log::warn!("Closing connection to client: {err:?}");
69+
re_log::warn!("Closing connection to client: {err}");
7070
}
7171
})
7272
.expect("Failed to spawn thread");

crates/re_sdk_comms/src/tcp_client.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,15 @@ impl TcpClient {
4040
match TcpStream::connect(&self.addrs[..]) {
4141
Ok(mut stream) => {
4242
if let Err(err) = stream.write(&crate::PROTOCOL_VERSION.to_le_bytes()) {
43-
anyhow::bail!(
44-
"Failed to send to Rerun server at {:?}: {err:?}",
45-
self.addrs
46-
);
43+
anyhow::bail!("Failed to send to Rerun server at {:?}: {err}", self.addrs);
4744
} else {
4845
self.stream = Some(stream);
4946
Ok(())
5047
}
5148
}
5249
Err(err) => {
5350
anyhow::bail!(
54-
"Failed to connect to Rerun server at {:?}: {err:?}",
51+
"Failed to connect to Rerun server at {:?}: {err}",
5552
self.addrs
5653
);
5754
}
@@ -69,18 +66,12 @@ impl TcpClient {
6966
re_log::trace!("Sending a packet of size {}…", packet.len());
7067
if let Err(err) = stream.write(&(packet.len() as u32).to_le_bytes()) {
7168
self.stream = None;
72-
anyhow::bail!(
73-
"Failed to send to Rerun server at {:?}: {err:?}",
74-
self.addrs
75-
);
69+
anyhow::bail!("Failed to send to Rerun server at {:?}: {err}", self.addrs);
7670
}
7771

7872
if let Err(err) = stream.write(packet) {
7973
self.stream = None;
80-
anyhow::bail!(
81-
"Failed to send to Rerun server at {:?}: {err:?}",
82-
self.addrs
83-
);
74+
anyhow::bail!("Failed to send to Rerun server at {:?}: {err}", self.addrs);
8475
}
8576

8677
Ok(())
@@ -93,7 +84,7 @@ impl TcpClient {
9384
pub fn flush(&mut self) {
9485
if let Some(stream) = &mut self.stream {
9586
if let Err(err) = stream.flush() {
96-
re_log::warn!("Failed to flush: {err:?}");
87+
re_log::warn!("Failed to flush: {err}");
9788
}
9889
}
9990
re_log::trace!("TCP stream flushed.");

crates/re_ui/src/static_image_cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ impl StaticImageCache {
1212
.entry(id)
1313
.or_insert_with(|| {
1414
let color_image = load_image_bytes(image_bytes)
15-
.unwrap_or_else(|err| panic!("Failed to load image {id:?}: {err:?}"));
15+
.unwrap_or_else(|err| panic!("Failed to load image {id:?}: {err}"));
1616
let retained_img = RetainedImage::from_color_image(id, color_image);
1717
Arc::new(retained_img)
1818
})

crates/re_viewer/src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl App {
547547
let log_db = self.log_dbs.entry(self.state.selected_rec_id).or_default();
548548

549549
if let Err(err) = log_db.add(msg) {
550-
re_log::error!("Failed to add incoming msg: {:?}", err);
550+
re_log::error!("Failed to add incoming msg: {err}");
551551
};
552552
if start.elapsed() > instant::Duration::from_millis(10) {
553553
egui_ctx.request_repaint(); // make sure we keep receiving messages asap

crates/re_viewer/src/ui/data_ui/log_msg.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@ impl DataUi for ArrowMsg {
122122
ui.end_row();
123123
});
124124
}
125-
Err(e) => {
126-
ui.label(ctx.re_ui.error_text(format!("Error parsing ArrowMsg: {e}")));
125+
Err(err) => {
126+
ui.label(
127+
ctx.re_ui
128+
.error_text(format!("Error parsing ArrowMsg: {err}")),
129+
);
127130
}
128131
}
129132
}

crates/re_viewer/src/ui/event_log_view.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ fn table_row(
209209
});
210210
}
211211
Err(err) => {
212-
re_log::error_once!("Bad arrow payload: {:?}", err);
212+
re_log::error_once!("Bad arrow payload: {err}",);
213213
row.col(|ui| {
214214
ui.label("Bad Arrow Payload".to_owned());
215215
});

crates/re_viewer/src/ui/view_spatial/scene/scene_part/arrows3d.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl ScenePart for Arrows3DPart {
137137
}) {
138138
Ok(_) | Err(QueryError::PrimaryNotFound) => {}
139139
Err(err) => {
140-
re_log::error_once!("Unexpected error querying '{:?}': {:?}", ent_path, err);
140+
re_log::error_once!("Unexpected error querying {ent_path:?}: {err}");
141141
}
142142
}
143143
}

crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes2d.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl ScenePart for Boxes2DPart {
144144
}) {
145145
Ok(_) | Err(QueryError::PrimaryNotFound) => {}
146146
Err(err) => {
147-
re_log::error_once!("Unexpected error querying '{:?}': {:?}", ent_path, err);
147+
re_log::error_once!("Unexpected error querying {ent_path:?}: {err}");
148148
}
149149
}
150150
}

crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes3d.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl ScenePart for Boxes3DPart {
142142
}) {
143143
Ok(_) | Err(QueryError::PrimaryNotFound) => {}
144144
Err(err) => {
145-
re_log::error_once!("Unexpected error querying '{:?}': {:?}", ent_path, err);
145+
re_log::error_once!("Unexpected error querying {ent_path:?}: {err}");
146146
}
147147
}
148148
}

crates/re_viewer/src/ui/view_spatial/scene/scene_part/cameras.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl ScenePart for CamerasPart {
225225
}) {
226226
Ok(_) | Err(QueryError::PrimaryNotFound) => {}
227227
Err(err) => {
228-
re_log::error_once!("Unexpected error querying '{:?}': {:?}", ent_path, err);
228+
re_log::error_once!("Unexpected error querying {ent_path:?}: {err}");
229229
}
230230
}
231231
}

0 commit comments

Comments
 (0)