Rust: small tweaks

Author: Paolo Tranquilli

rust/extractor/src/rust_analyzer.rs

@@ -120,18 +120,18 @@ pub fn find_project_manifests(
         .collect();
     let ret = ra_ap_project_model::ProjectManifest::discover_all(&abs_files);
     let iter = || ret.iter().map(|m| format!("  {m}"));
-    const log_limit: usize = 10;
-    if ret.len() <= log_limit {
+    const LOG_LIMIT: usize = 10;
+    if ret.len() <= LOG_LIMIT {
         info!("found manifests:\n{}", iter().join("\n"));
     } else {
         info!(
             "found manifests:\n{}\nand {} more",
-            iter().take(log_limit).join("\n"),
-            ret.len() - log_limit
+            iter().take(LOG_LIMIT).join("\n"),
+            ret.len() - LOG_LIMIT
         );
         debug!(
             "rest of the manifests found:\n{}",
-            iter().dropping(log_limit).join("\n")
+            iter().dropping(LOG_LIMIT).join("\n")
         );
     }
     Ok(ret)

rust/extractor/src/translate/base.rs

@@ -169,9 +169,9 @@ impl<'a> Translator<'a> {
     pub fn emit_diagnostic(
         &mut self,
         severity: DiagnosticSeverity,
-        error_tag: String,
-        error_message: String,
-        full_error_message: String,
+        tag: String,
+        message: String,
+        full_message: String,
         location: (LineCol, LineCol),
     ) {
         let (start, end) = location;
@@ -187,17 +187,12 @@ impl<'a> Translator<'a> {
             self.path,
             start.line + 1,
             start.col + 1,
-            &error_message
+            &message
         );
-        if severity != DiagnosticSeverity::Debug {
+        if severity > DiagnosticSeverity::Debug {
             let location = self.trap.emit_location_label(self.label, start, end);
-            self.trap.emit_diagnostic(
-                severity,
-                error_tag,
-                error_message,
-                full_error_message,
-                location,
-            );
+            self.trap
+                .emit_diagnostic(severity, tag, message, full_message, location);
         }
     }
     pub fn emit_parse_error(&mut self, owner: &impl ast::AstNode, err: &SyntaxError) {

rust/extractor/src/trap.rs

@@ -128,7 +128,7 @@ pub struct TrapFile {
     compression: Compression,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum DiagnosticSeverity {
     Debug = 10,
     Info = 20,