diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tty.rs | 6 | ||||
| -rw-r--r-- | src/dbus/mutter_display_config.rs | 11 | ||||
| -rw-r--r-- | src/dbus/mutter_screen_cast.rs | 2 | ||||
| -rw-r--r-- | src/ipc/client.rs | 2 | ||||
| -rw-r--r-- | src/niri.rs | 2 | ||||
| -rw-r--r-- | src/render_helpers/shader_element.rs | 4 | ||||
| -rw-r--r-- | src/ui/config_error_notification.rs | 3 |
7 files changed, 12 insertions, 18 deletions
diff --git a/src/backend/tty.rs b/src/backend/tty.rs index 198a63cc..4c8801f9 100644 --- a/src/backend/tty.rs +++ b/src/backend/tty.rs @@ -316,11 +316,11 @@ impl Tty { let mut node_path = String::new(); if let Some(path) = primary_render_node.dev_path() { - write!(node_path, "{:?}", path).unwrap(); + write!(node_path, "{path:?}").unwrap(); } else { - write!(node_path, "{}", primary_render_node).unwrap(); + write!(node_path, "{primary_render_node}").unwrap(); } - info!("using as the render node: {}", node_path); + info!("using as the render node: {node_path}"); Ok(Self { config, diff --git a/src/dbus/mutter_display_config.rs b/src/dbus/mutter_display_config.rs index b8ab08f9..fe445f64 100644 --- a/src/dbus/mutter_display_config.rs +++ b/src/dbus/mutter_display_config.rs @@ -189,8 +189,7 @@ impl DisplayConfig { for (connector, mode, _props) in requested_config.monitors { if !current_conf.values().any(|o| o.name == connector) { return Err(zbus::fdo::Error::Failed(format!( - "Connector '{}' not found", - connector + "Connector '{connector}' not found", ))); } new_conf.insert( @@ -210,8 +209,7 @@ impl DisplayConfig { 7 => niri_ipc::Transform::Flipped270, x => { return Err(zbus::fdo::Error::Failed(format!( - "Unknown transform {}", - x + "Unknown transform {x}", ))) } }, @@ -220,10 +218,7 @@ impl DisplayConfig { y: requested_config.y, }), mode: Some(niri_ipc::ConfiguredMode::from_str(&mode).map_err(|e| { - zbus::fdo::Error::Failed(format!( - "Could not parse mode '{}': {}", - mode, e - )) + zbus::fdo::Error::Failed(format!("Could not parse mode '{mode}': {e}")) })?), // FIXME: VRR ..Default::default() diff --git a/src/dbus/mutter_screen_cast.rs b/src/dbus/mutter_screen_cast.rs index d7918989..eb0ed2d4 100644 --- a/src/dbus/mutter_screen_cast.rs +++ b/src/dbus/mutter_screen_cast.rs @@ -120,7 +120,7 @@ impl ScreenCast { static NUMBER: AtomicUsize = AtomicUsize::new(0); let session_id = NUMBER.fetch_add(1, Ordering::SeqCst); - let path = format!("/org/gnome/Mutter/ScreenCast/Session/u{}", session_id); + let path = format!("/org/gnome/Mutter/ScreenCast/Session/u{session_id}"); let path = OwnedObjectPath::try_from(path).unwrap(); let session = Session::new(session_id, self.ipc_outputs.clone(), self.to_niri.clone()); diff --git a/src/ipc/client.rs b/src/ipc/client.rs index aead5ebe..5ddefd3b 100644 --- a/src/ipc/client.rs +++ b/src/ipc/client.rs @@ -297,7 +297,7 @@ pub fn handle_msg(msg: Msg, json: bool) -> anyhow::Result<()> { let [r, g, b] = color.rgb.map(|v| (v.clamp(0., 1.) * 255.).round() as u8); println!("Picked color: rgb({r}, {g}, {b})",); - println!("Hex: #{:02x}{:02x}{:02x}", r, g, b); + println!("Hex: #{r:02x}{g:02x}{b:02x}"); } else { println!("No color was picked."); } diff --git a/src/niri.rs b/src/niri.rs index 05db2fd0..cb4306c6 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -5242,7 +5242,7 @@ impl Niri { let dbus = &self.dbus.as_ref().unwrap(); let server = dbus.conn_screen_cast.as_ref().unwrap().object_server(); - let path = format!("/org/gnome/Mutter/ScreenCast/Session/u{}", session_id); + let path = format!("/org/gnome/Mutter/ScreenCast/Session/u{session_id}"); if let Ok(iface) = server.interface::<_, mutter_screen_cast::Session>(path) { let _span = tracy_client::span!("invoking Session::stop"); diff --git a/src/render_helpers/shader_element.rs b/src/render_helpers/shader_element.rs index 3c294971..04f5ab02 100644 --- a/src/render_helpers/shader_element.rs +++ b/src/render_helpers/shader_element.rs @@ -70,9 +70,9 @@ unsafe fn compile_program( texture_uniforms: &[&str], // destruction_callback_sender: Sender<CleanupResource>, ) -> Result<ShaderProgram, GlesError> { - let shader = format!("#version 100\n{}", src); + let shader = format!("#version 100\n{src}"); let program = unsafe { link_program(gl, include_str!("shaders/texture.vert"), &shader)? }; - let debug_shader = format!("#version 100\n#define DEBUG_FLAGS\n{}", src); + let debug_shader = format!("#version 100\n#define DEBUG_FLAGS\n{src}"); let debug_program = unsafe { link_program(gl, include_str!("shaders/texture.vert"), &debug_shader)? }; diff --git a/src/ui/config_error_notification.rs b/src/ui/config_error_notification.rs index bd46aa7d..9b414f00 100644 --- a/src/ui/config_error_notification.rs +++ b/src/ui/config_error_notification.rs @@ -187,8 +187,7 @@ fn render( if let Some(path) = created_path { text = format!( "Created a default config file at \ - <span face='monospace' bgcolor='#000000'>{:?}</span>", - path + <span face='monospace' bgcolor='#000000'>{path:?}</span>", ); border_color = (0.5, 1., 0.5); }; |