Apply lint

Signed-off-by: Andrew Stein <[email protected]>

Author: No Author

packages/perspective-react/package.json

@@ -29,6 +29,7 @@
     },
     "devDependencies": {
         "@finos/perspective-esbuild-plugin": "workspace:^",
+        "typescript": "~5.2.2",
         "zx": "^8.3.0"
     }
 }

packages/perspective-viewer-d3fc/package.json

@@ -63,6 +63,7 @@
         "@types/d3": "^7.0.0",
         "@finos/perspective-esbuild-plugin": "workspace:^",
         "@finos/perspective-test": "workspace:^",
-        "@prospective.co/procss": "^0.1.16"
+        "@prospective.co/procss": "^0.1.16",
+        "typescript": "~5.2.2"
     }
 }

pnpm-lock.yaml

@@ -62,7 +62,7 @@ fn build(pkg: Option<&str>, is_release: bool, features: Vec<String>) {
 fn bindgen(outdir: &Path, artifact: &str, is_release: bool) {
     let input = Path::new("../target/wasm32-unknown-unknown")
         .join(if is_release { "release" } else { "debug" })
-        .join(format!("{}.wasm", artifact));
+        .join(format!("{artifact}.wasm"));
 
     Bindgen::new()
         .web(true)

rust/bundle/main.rs

@@ -106,7 +106,7 @@ mod name_registry {
         } else {
             let mut guard = CLIENT_ID_GEN.lock()?;
             *guard += 1;
-            Ok(format!("client-{}", guard))
+            Ok(format!("client-{guard}"))
         }
     }
 }
@@ -273,7 +273,7 @@ impl Client {
             msg_id,
             entity_id: "".to_string(),
             client_resp: Some(ClientResp::ServerError(ServerError {
-                message: format!("{}", message),
+                message: format!("{message}"),
                 status_code: 2,
             })),
         };
@@ -389,7 +389,7 @@ impl Client {
         self.subscribe_once(req, on_update).await?;
         receiver
             .await
-            .map_err(|_| ClientError::Unknown(format!("Internal error for req {}", req)))
+            .map_err(|_| ClientError::Unknown(format!("Internal error for req {req}")))
     }
 
     pub(crate) fn get_features(&self) -> ClientResult<Features> {

rust/perspective-client/src/rust/client.rs

@@ -144,7 +144,7 @@ impl Display for SingleAggregate {
             Self::Min => "min",
         };
 
-        write!(fmt, "{}", term)
+        write!(fmt, "{term}")
     }
 }
 
@@ -182,7 +182,7 @@ impl FromStr for SingleAggregate {
             "high minus low" => Ok(Self::HighMinusLow),
             "stddev" => Ok(Self::StdDev),
             "var" => Ok(Self::Var),
-            x => Err(format!("Unknown aggregate `{}`", x)),
+            x => Err(format!("Unknown aggregate `{x}`")),
         }
     }
 }
@@ -226,12 +226,12 @@ impl From<&'static str> for Aggregate {
 impl Display for Aggregate {
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
         match self {
-            Self::SingleAggregate(x) => write!(fmt, "{}", x)?,
+            Self::SingleAggregate(x) => write!(fmt, "{x}")?,
             Self::MultiAggregate(MultiAggregate::WeightedMean, x) => {
-                write!(fmt, "weighted mean by {}", x)?
+                write!(fmt, "weighted mean by {x}")?
             },
-            Self::MultiAggregate(MultiAggregate::MaxBy, x) => write!(fmt, "max by {}", x)?,
-            Self::MultiAggregate(MultiAggregate::MinBy, x) => write!(fmt, "min by {}", x)?,
+            Self::MultiAggregate(MultiAggregate::MaxBy, x) => write!(fmt, "max by {x}")?,
+            Self::MultiAggregate(MultiAggregate::MinBy, x) => write!(fmt, "min by {x}")?,
         };
         Ok(())
     }

rust/perspective-client/src/rust/config/aggregates.rs

@@ -54,7 +54,7 @@ impl TryFrom<&str> for ColumnType {
         } else if val == "datetime" {
             Ok(Self::Datetime)
         } else {
-            Err(ClientError::Internal(format!("Unknown type {}", val)))
+            Err(ClientError::Internal(format!("Unknown type {val}")))
         }
     }
 }

rust/perspective-client/src/rust/config/column_type.rs

@@ -668,10 +668,8 @@ fn test_completions_insert_text_matches_label() {
         let label = comp.label;
         let insert_text = comp.insert_text;
         assert!(
-            insert_text.starts_with(&label),
-            "insert_text for label {label} does not start with {label}:\n    {insert_text}",
-            label = label,
-            insert_text = insert_text
+            insert_text.starts_with(label),
+            "insert_text for label {label} does not start with {label}:\n    {insert_text}"
         );
     }
 }

rust/perspective-client/src/rust/config/expressions.rs

@@ -48,9 +48,9 @@ impl Default for Scalar {
 impl Display for Scalar {
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
         match self {
-            Self::Float(x) => write!(fmt, "{}", x),
-            Self::String(x) => write!(fmt, "{}", x),
-            Self::Bool(x) => write!(fmt, "{}", x),
+            Self::Float(x) => write!(fmt, "{x}"),
+            Self::String(x) => write!(fmt, "{x}"),
+            Self::Bool(x) => write!(fmt, "{x}"),
             Self::Null => write!(fmt, ""),
         }
     }
@@ -82,12 +82,12 @@ impl Display for FilterTerm {
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
         match self {
             Self::Scalar(x) => {
-                write!(fmt, "{}", x)?;
+                write!(fmt, "{x}")?;
             },
             Self::Array(xs) => write!(
                 fmt,
                 "{}",
-                Itertools::intersperse(xs.iter().map(|x| format!("{}", x)), ",".to_owned())
+                Itertools::intersperse(xs.iter().map(|x| format!("{x}")), ",".to_owned())
                     .collect::<String>()
             )?,
         }

rust/perspective-client/src/rust/config/filters.rs

@@ -57,7 +57,7 @@ impl TableReadFormat {
             Some("arrow") => Some(TableReadFormat::Arrow),
             Some("ndjson") => Some(TableReadFormat::Ndjson),
             None => None,
-            Some(x) => return Err(format!("Unknown format \"{}\"", x)),
+            Some(x) => return Err(format!("Unknown format \"{x}\"")),
         })
     }
 }
@@ -92,7 +92,7 @@ pub struct TableInitOptions {
 
 impl TableInitOptions {
     pub fn set_name<D: Display>(&mut self, name: D) {
-        self.name = Some(format!("{}", name))
+        self.name = Some(format!("{name}"))
     }
 }