Clippy

rust-diplomat · Dec 12, 2024 · f5f17f0 · f5f17f0
1 parent 9a3bb20
commit f5f17f0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/tool/src/js/converter.rs b/tool/src/js/converter.rs
@@ -71,7 +71,7 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
 
                 // Add to the import list:
                 self.add_import(
-                    type_name.clone().into(),
+                    type_name.clone(),
                     None,
                     super::gen::ImportUsage::Both,
                 );
@@ -93,7 +93,7 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
 
                 // Add to the import list:
                 self.add_import(
-                    type_name.clone().into(),
+                    type_name.clone(),
                     None,
                     super::gen::ImportUsage::Both,
                 );
@@ -110,7 +110,7 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
 
                 // Add to the import list:
                 self.add_import(
-                    type_name.clone().into(),
+                    type_name.clone(),
                     None,
                     super::gen::ImportUsage::Both,
                 );
@@ -466,7 +466,7 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
                 let (requires_buf, error_ret) = match return_type {
                     ReturnType::Fallible(s, Some(e)) => {
                         let type_name = self.formatter.fmt_type_name(e.id().unwrap());
-                        self.add_import(type_name.into(), None, super::gen::ImportUsage::Both);
+                        self.add_import(type_name, None, super::gen::ImportUsage::Both);
 
                         let fields_empty = matches!(e, Type::Struct(s) if match s.resolve(self.tcx) {
                                 ReturnableStructDef::Struct(s) => s.fields.is_empty(),

diff --git a/tool/src/js/gen.rs b/tool/src/js/gen.rs
@@ -92,7 +92,6 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
                     .fmt_file_name_extensionless(&import_str)
                     .into(),
             ),
-            usage: usage.clone(),
         };
         if usage == ImportUsage::Module || usage == ImportUsage::Both {
             self.imports.borrow_mut().js.insert(inf.clone());
@@ -114,7 +113,6 @@ impl<'tcx> TyGenContext<'_, 'tcx> {
         let inf = ImportInfo {
             import_type: import_str,
             import_file: import_file.unwrap_or_default(),
-            usage: usage.clone(),
         };
 
         if usage == ImportUsage::Module || usage == ImportUsage::Both {
@@ -743,7 +741,6 @@ pub(super) enum ImportUsage {
 pub(super) struct ImportInfo<'info> {
     import_type: Cow<'info, str>,
     import_file: Cow<'info, str>,
-    usage: ImportUsage,
 }
 
 /// Imports are only unique if they use a different type. We don't care about anything else.
@@ -755,7 +752,7 @@ impl<'info> Ord for ImportInfo<'info> {
 
 impl<'info> PartialOrd for ImportInfo<'info> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.import_type.partial_cmp(&other.import_type)
+        Some(self.import_type.cmp(&other.import_type))
     }
 }
 

diff --git a/tool/src/js/mod.rs b/tool/src/js/mod.rs
@@ -160,7 +160,7 @@ pub(crate) fn run<'tcx>(
 
             // Remove our self reference:
             context.remove_import(
-                context.type_name.clone().into(),
+                context.type_name.clone(),
                 None,
                 gen::ImportUsage::Both,
             );