summaryrefslogtreecommitdiff
path: root/utils/src/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'utils/src/legacy')
-rw-r--r--utils/src/legacy/display.rs2
-rw-r--r--utils/src/legacy/env.rs5
-rw-r--r--utils/src/legacy/globber.rs21
-rw-r--r--utils/src/legacy/input.rs14
-rw-r--r--utils/src/legacy/logger.rs2
5 files changed, 23 insertions, 21 deletions
diff --git a/utils/src/legacy/display.rs b/utils/src/legacy/display.rs
index fc94d90..57f4f5b 100644
--- a/utils/src/legacy/display.rs
+++ b/utils/src/legacy/display.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::all)]
+
use colored::*;
use just_enough_vcs::lib::data::sheet::SheetMappingMetadata;
use std::{
diff --git a/utils/src/legacy/env.rs b/utils/src/legacy/env.rs
index 1834cd3..b4ad089 100644
--- a/utils/src/legacy/env.rs
+++ b/utils/src/legacy/env.rs
@@ -67,10 +67,7 @@ pub fn auto_update_outdate() -> i64 {
}
match std::env::var("JV_OUTDATED_MINUTES") {
- Ok(value) => match value.trim().parse::<i64>() {
- Ok(num) => num,
- Err(_) => -1,
- },
+ Ok(value) => value.trim().parse::<i64>().unwrap_or(-1),
Err(_) => -1,
}
}
diff --git a/utils/src/legacy/globber.rs b/utils/src/legacy/globber.rs
index 4d722db..b6a3032 100644
--- a/utils/src/legacy/globber.rs
+++ b/utils/src/legacy/globber.rs
@@ -69,9 +69,7 @@ impl Globber {
}
};
- let pattern = if pattern.is_empty() {
- "*".to_string()
- } else if pattern == "." {
+ let pattern = if pattern.is_empty() || pattern == "." {
"*".to_string()
} else if pattern.ends_with(SPLIT_STR) {
format!("{}*", pattern)
@@ -182,7 +180,7 @@ impl<T: AsRef<str>> From<T> for Globber {
}
}
-#[derive(Debug, Clone, Hash)]
+#[derive(Debug, Clone)]
pub enum GlobItem {
File(String),
Directory(String),
@@ -207,6 +205,21 @@ impl std::fmt::Display for GlobItem {
}
}
+impl std::hash::Hash for GlobItem {
+ fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+ match self {
+ GlobItem::File(name) => {
+ state.write_u8(0);
+ name.hash(state);
+ }
+ GlobItem::Directory(name) => {
+ state.write_u8(1);
+ name.hash(state);
+ }
+ }
+ }
+}
+
impl Eq for GlobItem {}
pub mod constants {
diff --git a/utils/src/legacy/input.rs b/utils/src/legacy/input.rs
index 95d53cb..501ce69 100644
--- a/utils/src/legacy/input.rs
+++ b/utils/src/legacy/input.rs
@@ -89,10 +89,7 @@ pub async fn input_with_editor_cutsom(
let status = Command::new(editor).arg(cache_path).status().await?;
if !status.success() {
- return Err(std::io::Error::new(
- std::io::ErrorKind::Other,
- "Editor exited with non-zero status",
- ));
+ return Err(std::io::Error::other("Editor exited with non-zero status"));
}
// Read the modified content
@@ -101,14 +98,7 @@ pub async fn input_with_editor_cutsom(
// Remove comment lines and trim
let processed_content: String = content
.lines()
- .filter_map(|line| {
- let trimmed = line.trim();
- if trimmed.starts_with(comment_prefix) {
- None
- } else {
- Some(line)
- }
- })
+ .filter(|line| !line.trim().starts_with(comment_prefix))
.collect::<Vec<&str>>()
.join("\n");
diff --git a/utils/src/legacy/logger.rs b/utils/src/legacy/logger.rs
index 1bc96c1..7c18d30 100644
--- a/utils/src/legacy/logger.rs
+++ b/utils/src/legacy/logger.rs
@@ -79,7 +79,7 @@ pub fn build_env_logger(log_path: impl AsRef<Path>, logger_level: LoggerLevel) {
builder
.format(log_format)
- .filter(None, level.clone())
+ .filter(None, level)
.filter_module("just_enough_vcs", level)
.target(combined_target)
.init();