From b2fe275aa4486cfcb54e8149878402f64b0c84dd Mon Sep 17 00:00:00 2001 From: brian cully Date: Mon, 29 Dec 2025 20:44:00 -0500 Subject: wasm: string interpolation --- src/lib.rs | 12 ++++-------- src/point.rs | 8 ++++---- src/render_loop.rs | 4 ++-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 71f0afd..6d45990 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -102,7 +102,7 @@ pub fn init() -> JSResult<()> { }); let dot_count_handler: HandlerClosure = Closure::new(move |e| { - debug!("dot count changed {:?} - {}", e, dots_val()?); + debug!("dot count changed {e:?} - {}", dots_val()?); let mut s = s2.borrow_mut(); s.set_dot_count(dots_val()?); s.render_frame(0.0)?; @@ -114,7 +114,7 @@ pub fn init() -> JSResult<()> { dot_count_handler.forget(); let go_handler: HandlerClosure = Closure::new(move |e| { - debug!("go clicked: {:?}", e); + debug!("go clicked: {e:?}"); let mut p = p1.lock().unwrap(); *p = !*p; let text = if *p { @@ -131,7 +131,7 @@ pub fn init() -> JSResult<()> { go_handler.forget(); let bench_handler: HandlerClosure = Closure::new(move |e| { - debug!("bench clicked {:?}", e); + debug!("bench clicked {e:?}"); let iters = iters()? .value() @@ -159,11 +159,7 @@ pub fn init() -> JSResult<()> { let iters_per_ms = Into::::into(iters) / delta; results()?.set_text_content(Some( - format!( - "{} iters in {:0.2} ms ({:0.2} iters per ms)", - iters, delta, iters_per_ms - ) - .as_str(), + format!("{iters} iters in {delta:0.2} ms ({iters_per_ms:0.2} iters per ms)").as_str(), )); Ok(()) }); diff --git a/src/point.rs b/src/point.rs index 18d3d5f..34cdb69 100644 --- a/src/point.rs +++ b/src/point.rs @@ -3,12 +3,12 @@ use crate::state::{MAX_SPEED, TAU}; const POINT_RADIUS: f64 = 0.01; fn rand_color() -> String { - format!( - "rgb({} {} {})", + let [r, g, b] = [ fastrand::u8(0..255), fastrand::u8(0..255), - fastrand::u8(0..255) - ) + fastrand::u8(0..255), + ]; + format!("rgb({r} {g} {b})",) } #[derive(Clone, Debug)] diff --git a/src/render_loop.rs b/src/render_loop.rs index 2dd0f9d..e00828b 100644 --- a/src/render_loop.rs +++ b/src/render_loop.rs @@ -31,11 +31,11 @@ impl RenderLoop { let rloop = inner.clone(); let f = unsafe { &mut *inner.get() }; *f = Closure::new(move |t| match fun(t) { - Err(e) => error!("render callback error: {:?}", e), + Err(e) => error!("render callback error: {e:?}"), Ok(true) => { let cl = unsafe { &*rloop.get() }; if let Err(e) = Self::request_animation_frame(cl) { - error!("couldn't request animation frame: {:?}", e); + error!("couldn't request animation frame: {e:?}"); } } Ok(false) => {} -- cgit v1.3