Fix new nightly clippy suggestions in type trie and linker

Author: LegNeato

crates/rustc_codegen_spirv-types/src/compile_result.rs

@@ -69,7 +69,7 @@ impl<'a> Trie<'a> {
 
     fn emit(&self, builder: &mut String, full_name: String, indent: usize) {
         let mut children = self.children.iter().collect::<Vec<_>>();
-        children.sort_unstable_by(|(k1, _), (k2, _)| k1.cmp(k2));
+        children.sort_unstable_by_key(|(k1, _)| *k1);
         for (child_name, child) in children {
             let full_child_name = if full_name.is_empty() {
                 (*child_name).to_string()

crates/rustc_codegen_spirv/src/linker/specializer.rs

@@ -879,14 +879,13 @@ impl<'a> InferOperandList<'a> {
 
             // Maybe filter this operand, but only *after* consuming the "generic" args for it.
             match self.transform {
-                None => {}
-
                 // Skip a non-ID operand.
-                Some(InferOperandListTransform::TypeOfId) => {
-                    if first_operand.id_ref_any().is_none() {
-                        continue;
-                    }
+                Some(InferOperandListTransform::TypeOfId)
+                    if first_operand.id_ref_any().is_none() =>
+                {
+                    continue;
                 }
+                None | Some(InferOperandListTransform::TypeOfId) => {}
             }
 
             // Maybe replace this operand with a different one.

crates/rustc_codegen_spirv/src/linker/spirt_passes/diagnostics.rs

@@ -336,8 +336,9 @@ impl UseOrigin<'_> {
                 inst_attrs: _,
                 origin,
             } => {
-                let func_desc = special_func
-                    .map(|special_func| match special_func {
+                let func_desc = special_func.map_or_else(
+                    || name_from_attrs(*func_attrs, "function"),
+                    |special_func| match special_func {
                         SpecialFunc::Exported(&ExportKey::LinkName(name)) => {
                             format!("function export `{}`", &cx[name])
                         }
@@ -361,8 +362,8 @@ impl UseOrigin<'_> {
                             "" => "unnamed function".into(),
                             callee_name => format!("`{callee_name}`"),
                         },
-                    })
-                    .unwrap_or_else(|| name_from_attrs(*func_attrs, "function"));
+                    },
+                );
                 match origin {
                     IntraFuncUseOrigin::CallCallee => format!("called by {func_desc}"),
                     IntraFuncUseOrigin::Other => format!("used from within {func_desc}"),