Remove im_str macro, fix warnings and Clippy lints

Author: SpaceManiac

crates/spaceman-dmm/build.rs

@@ -10,7 +10,7 @@ use std::process::Command;
 fn main() {
     // build info
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());
-    let mut f = File::create(&out_dir.join("build-info.txt")).unwrap();
+    let mut f = File::create(out_dir.join("build-info.txt")).unwrap();
 
     if let Ok(commit) = read_commit() {
         writeln!(f, "commit: {}", commit).unwrap();
@@ -19,28 +19,28 @@ fn main() {
 
     // windres icon
     if cfg!(windows) {
-        let out_dir = env::var("OUT_DIR").ok().expect("can't find out_dir");
+        let out_dir = env::var("OUT_DIR").expect("can't find out_dir");
 
         if cfg!(target_env = "msvc") {
             if let Err(e) = Command::new("windres")
-                .args(&["res/editor.rc", "-o"])
-                .arg(&format!("{}/editor_rc.lib", out_dir))
+                .args(["res/editor.rc", "-o"])
+                .arg(format!("{}/editor_rc.lib", out_dir))
                 .status()
             {
                 println!("cargo:warning=`windres` unavailable: {}", e);
                 return;
             }
         } else {
             if let Err(e) = Command::new("windres")
-                .args(&["res/editor.rc", "-o"])
-                .arg(&format!("{}/editor.rc.o", out_dir))
+                .args(["res/editor.rc", "-o"])
+                .arg(format!("{}/editor.rc.o", out_dir))
                 .status()
             {
                 println!("cargo:warning=`windres` unavailable: {}", e);
                 return;
             }
             Command::new("ar")
-                .args(&["crus", "libeditor_rc.a", "editor.rc.o"])
+                .args(["crus", "libeditor_rc.a", "editor.rc.o"])
                 .current_dir(Path::new(&out_dir))
                 .status()
                 .unwrap();

crates/spaceman-dmm/src/dmi.rs

@@ -85,7 +85,7 @@ impl IconCache {
 }
 
 impl TextureCache {
-    pub fn retrieve(&mut self, device: &Device, icons: &IconCache, id: usize) -> &Texture {
+    pub fn retrieve(&mut self, device: &Device, icons: &IconCache, id: usize) -> &Texture<'_> {
         if id >= self.textures.len() {
             self.textures.resize_with(id + 1, Default::default);
         }
@@ -146,7 +146,7 @@ impl IconFile {
     }
 }
 
-pub fn texture_from_bytes<'r>(device: &Device, bytes: &[u8]) -> io::Result<Texture<'r>> {
+pub fn texture_from_bytes(device: &Device, bytes: &[u8]) -> io::Result<Texture<'static>> {
     let mut decoder = Decoder::new();
     decoder.info_raw_mut().colortype = ColorType::RGBA;
     decoder.info_raw_mut().set_bitdepth(8);
@@ -159,7 +159,7 @@ pub fn texture_from_bytes<'r>(device: &Device, bytes: &[u8]) -> io::Result<Textu
     Ok(load_texture(device, &bitmap))
 }
 
-pub fn load_texture<'r>(device: &Device, bitmap: &lodepng::Bitmap<RGBA>) -> Texture<'static> {
+pub fn load_texture(device: &Device, bitmap: &lodepng::Bitmap<RGBA>) -> Texture<'static> {
     let width = bitmap.width as u32;
     let height = bitmap.height as u32;
 
@@ -186,7 +186,8 @@ pub fn load_texture<'r>(device: &Device, bitmap: &lodepng::Bitmap<RGBA>) -> Text
     let mut mem = transfer_buffer.map::<u8>(device, true);
     let mut dest = mem.mem_mut();
     for pixel in &bitmap.buffer {
-        dest.write_all(&[pixel.a, pixel.b, pixel.g, pixel.r]);
+        dest.write_all(&[pixel.a, pixel.b, pixel.g, pixel.r])
+            .unwrap();
     }
     mem.unmap();
 

crates/spaceman-dmm/src/edit_prefab.rs

@@ -67,7 +67,7 @@ impl EditPrefab {
 
         // show the instance variables - everything which is
         // actually set is right at the top
-        ui.text(im_str!("Instance variables ({})", fab.vars.len()));
+        ui.text(format!("Instance variables ({})", fab.vars.len()));
         let mut remove = std::collections::HashSet::new();
         for (name, value) in fab.vars.iter() {
             if !name.contains(filter.as_str()) {
@@ -76,18 +76,18 @@ impl EditPrefab {
             // TODO: red instead of green if invalid var
             {
                 let style = ui.push_style_color(StyleColor::Text, GREEN);
-                ui.text(&im_str!("  {}", name));
+                ui.text(format!("  {}", name));
                 style.pop();
             }
             ui.same_line_with_spacing(offset, 0.);
-            if ui.small_button(&im_str!("X##editprefab_remove_{}", name)) {
+            if ui.small_button(format!("X##editprefab_remove_{}", name)) {
                 remove.insert(name.to_owned());
             }
             if ui.is_item_hovered() {
                 ui.tooltip_text("Reset");
             }
             ui.same_line();
-            ui.text(im_str!("{}", value));
+            ui.text(format!("{}", value));
         }
         for key in remove {
             fab.vars.shift_remove(&key);
@@ -107,7 +107,7 @@ impl EditPrefab {
         let mut search_ty = ty;
         while let Some(search) = search_ty {
             ui.separator();
-            ui.text(im_str!("{}", &search.path));
+            ui.text(&search.path);
 
             for (name, var) in search.vars.iter() {
                 if !name.contains(filter.as_str()) {
@@ -126,10 +126,10 @@ impl EditPrefab {
 
                     if instance_value.is_some() {
                         let style = ui.push_style_color(StyleColor::Text, GREEN);
-                        ui.text(im_str!("{} {}", prefix, name));
+                        ui.text(format!("{} {}", prefix, name));
                         style.pop();
                     } else {
-                        ui.text(im_str!("{} {}", prefix, name));
+                        ui.text(format!("{} {}", prefix, name));
                     }
 
                     if prefix == "-" && ui.is_item_hovered() {
@@ -144,16 +144,16 @@ impl EditPrefab {
                     if let Some(c) = instance_value {
                         ui.same_line_with_spacing(offset, 0.);
                         let style = ui.push_style_color(StyleColor::Text, GREEN);
-                        ui.text(im_str!(" {}    ", c));
+                        ui.text(format!(" {}    ", c));
                         style.pop();
                         if ui.is_item_hovered() {
                             if let Some(c) = original_value {
-                                ui.tooltip_text(im_str!("Was: {}", c));
+                                ui.tooltip_text(format!("Was: {}", c));
                             }
                         }
                     } else if let Some(c) = original_value {
                         ui.same_line_with_spacing(offset, 0.);
-                        ui.text(im_str!(" {}    ", c));
+                        ui.text(format!(" {}    ", c));
                         if ui.is_item_hovered() {
                             ui.set_mouse_cursor(Some(MouseCursor::TextInput));
                             ui.tooltip_text("Click to edit");