From e3e7a53d471aaaea3b3b72f30c3cc37008b5ac93 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 20 Apr 2023 18:45:10 +0200 Subject: [PATCH 1/2] Lint: Properly name errors in `map_err` --- scripts/lint.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/lint.py b/scripts/lint.py index 375e156ed263..b56653670877 100755 --- a/scripts/lint.py +++ b/scripts/lint.py @@ -17,6 +17,7 @@ todo_pattern = re.compile(r"TODO([^(]|$)") debug_format_of_err = re.compile(r"\{\:#?\?\}.*, err") error_match_name = re.compile(r"Err\((\w+)\)") +error_map_err_name = re.compile(r"map_err\(\|(\w+)\|") wasm_caps = re.compile(r"\bWASM\b") nb_prefix = re.compile(r"nb_") @@ -52,7 +53,8 @@ def lint_line(line: str) -> Optional[str]: if "{err:?}" in line or "{err:#?}" in line or debug_format_of_err.search(line): return "Format errors with re_error::format or using Display - NOT Debug formatting!" - if m := re.search(error_match_name, line): + m = re.search(error_map_err_name, line) or re.search(error_match_name, line) + if m: name = m.group(1) # if name not in ("err", "_err", "_"): if name in ("e", "error"): @@ -82,6 +84,9 @@ def test_lint_line() -> None: "if let Err(err) = foo", "if let Err(_err) = foo", "if let Err(_) = foo", + "map_err(|err| …)", + "map_err(|_err| …)", + "map_err(|_| …)", "WASM_FOO env var", "Wasm", "num_instances", @@ -100,6 +105,7 @@ def test_lint_line() -> None: 'eprintln!("{:?}", err)', 'eprintln!("{:#?}", err)', "if let Err(error) = foo", + "map_err(|e| …)", "We use WASM in Rerun", "nb_instances", "inner_nb_instances", From fee2c93ef2123ddbd7de4b6d1fd29fb7586b11b3 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 20 Apr 2023 18:46:18 +0200 Subject: [PATCH 2/2] Use correct names for errors --- crates/re_log_types/src/arrow_msg.rs | 6 +++--- crates/re_web_viewer_server/src/lib.rs | 2 +- crates/re_ws_comms/src/server.rs | 2 +- crates/rerun/src/run.rs | 2 +- rerun_py/src/arrow.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/re_log_types/src/arrow_msg.rs b/crates/re_log_types/src/arrow_msg.rs index 54e5c01b68e5..b83e24266d29 100644 --- a/crates/re_log_types/src/arrow_msg.rs +++ b/crates/re_log_types/src/arrow_msg.rs @@ -42,13 +42,13 @@ impl serde::Serialize for ArrowMsg { let mut writer = StreamWriter::new(&mut buf, Default::default()); writer .start(&self.schema, None) - .map_err(|e| serde::ser::Error::custom(e.to_string()))?; + .map_err(|err| serde::ser::Error::custom(err.to_string()))?; writer .write(&self.chunk, None) - .map_err(|e| serde::ser::Error::custom(e.to_string()))?; + .map_err(|err| serde::ser::Error::custom(err.to_string()))?; writer .finish() - .map_err(|e| serde::ser::Error::custom(e.to_string()))?; + .map_err(|err| serde::ser::Error::custom(err.to_string()))?; let mut inner = serializer.serialize_tuple(3)?; inner.serialize_element(&self.table_id)?; diff --git a/crates/re_web_viewer_server/src/lib.rs b/crates/re_web_viewer_server/src/lib.rs index 4d8f29172588..e6964931c490 100644 --- a/crates/re_web_viewer_server/src/lib.rs +++ b/crates/re_web_viewer_server/src/lib.rs @@ -211,7 +211,7 @@ impl WebViewerServer { pub fn new(port: WebViewerServerPort) -> Result { let bind_addr = format!("0.0.0.0:{port}").parse()?; let server = hyper::Server::try_bind(&bind_addr) - .map_err(|e| WebViewerServerError::BindFailed(port, e))? + .map_err(|err| WebViewerServerError::BindFailed(port, err))? .serve(MakeSvc); Ok(Self { server }) } diff --git a/crates/re_ws_comms/src/server.rs b/crates/re_ws_comms/src/server.rs index d6fde09d2851..d8b3e4acc900 100644 --- a/crates/re_ws_comms/src/server.rs +++ b/crates/re_ws_comms/src/server.rs @@ -34,7 +34,7 @@ impl RerunServer { let listener = TcpListener::bind(&bind_addr) .await - .map_err(|e| RerunServerError::BindFailed(port, e))?; + .map_err(|err| RerunServerError::BindFailed(port, err))?; let port = RerunServerPort(listener.local_addr()?.port()); diff --git a/crates/rerun/src/run.rs b/crates/rerun/src/run.rs index 979c05705ff7..1c328f065d82 100644 --- a/crates/rerun/src/run.rs +++ b/crates/rerun/src/run.rs @@ -441,7 +441,7 @@ async fn run_impl( app.set_profiler(profiler); Box::new(app) })) - .map_err(|e| e.into()); + .map_err(|err| err.into()); #[cfg(not(feature = "native_viewer"))] { diff --git a/rerun_py/src/arrow.rs b/rerun_py/src/arrow.rs index b7e8c0220006..0a0d7e5663cd 100644 --- a/rerun_py/src/arrow.rs +++ b/rerun_py/src/arrow.rs @@ -35,7 +35,7 @@ fn array_to_rust(arrow_array: &PyAny, name: Option<&str>) -> PyResult<(Box) -> PyResult<(Box