From 36b7723a93a2c71851833712e4d9aaa5588376c4 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Fri, 12 Jan 2024 13:50:32 +0100
Subject: [PATCH] Remove stale lint suppression
Feature fish-ffi-tests is no more so we don't need this warning.
---
fish-rust/src/lib.rs | 1 -
fish-rust/src/tests/abbrs.rs | 6 +-----
fish-rust/src/tests/complete.rs | 3 +--
fish-rust/src/tests/env.rs | 2 +-
fish-rust/src/tests/env_universal_common.rs | 1 -
fish-rust/src/tests/expand.rs | 1 -
fish-rust/src/tests/highlight.rs | 5 +----
fish-rust/src/tests/history.rs | 11 ++++-------
fish-rust/src/tests/mod.rs | 2 --
fish-rust/src/tests/parser.rs | 2 --
fish-rust/src/wutil/mod.rs | 1 -
fish-rust/src/wutil/tests.rs | 1 -
12 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/fish-rust/src/lib.rs b/fish-rust/src/lib.rs
index bee3c7832..e11dbcdfa 100644
--- a/fish-rust/src/lib.rs
+++ b/fish-rust/src/lib.rs
@@ -104,5 +104,4 @@ pub mod wildcard;
pub mod wutil;
#[cfg(test)]
-#[allow(unused_imports)] // Easy way to suppress warnings while we have two testing modes.
mod tests;
diff --git a/fish-rust/src/tests/abbrs.rs b/fish-rust/src/tests/abbrs.rs
index a31e0f1c7..c3c33d2c1 100644
--- a/fish-rust/src/tests/abbrs.rs
+++ b/fish-rust/src/tests/abbrs.rs
@@ -1,12 +1,8 @@
use crate::abbrs::{self, abbrs_get_set, abbrs_match, Abbreviation};
-use crate::complete::CompleteFlags;
use crate::editable_line::{apply_edit, Edit};
use crate::highlight::HighlightSpec;
use crate::parser::Parser;
-use crate::reader::{
- combine_command_and_autosuggestion, completion_apply_to_command_line,
- reader_expand_abbreviation_at_cursor,
-};
+use crate::reader::reader_expand_abbreviation_at_cursor;
use crate::tests::prelude::*;
use crate::wchar::prelude::*;
diff --git a/fish-rust/src/tests/complete.rs b/fish-rust/src/tests/complete.rs
index fe1ed889e..affb08ef9 100644
--- a/fish-rust/src/tests/complete.rs
+++ b/fish-rust/src/tests/complete.rs
@@ -2,7 +2,7 @@ use crate::abbrs::{self, with_abbrs_mut, Abbreviation};
use crate::complete::{
complete, complete_add, complete_add_wrapper, complete_get_wrap_targets,
complete_remove_wrapper, sort_and_prioritize, CompleteFlags, CompleteOptionType,
- CompletionList, CompletionMode, CompletionRequestOptions,
+ CompletionMode, CompletionRequestOptions,
};
use crate::env::{EnvMode, Environment};
use crate::io::IoChain;
@@ -12,7 +12,6 @@ use crate::operation_context::{
use crate::parser::Parser;
use crate::reader::completion_apply_to_command_line;
use crate::tests::prelude::*;
-use crate::tests::prelude::*;
use crate::wchar::prelude::*;
use crate::wcstringutil::join_strings;
use std::collections::HashMap;
diff --git a/fish-rust/src/tests/env.rs b/fish-rust/src/tests/env.rs
index b96010a47..da8c503c4 100644
--- a/fish-rust/src/tests/env.rs
+++ b/fish-rust/src/tests/env.rs
@@ -4,7 +4,7 @@ use crate::tests::prelude::*;
use crate::wchar::prelude::*;
use crate::wutil::wgetcwd;
use std::collections::HashMap;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::time::{SystemTime, UNIX_EPOCH};
use widestring_suffix::widestrs;
/// An environment built around an std::map.
diff --git a/fish-rust/src/tests/env_universal_common.rs b/fish-rust/src/tests/env_universal_common.rs
index b3fbc2063..85853776d 100644
--- a/fish-rust/src/tests/env_universal_common.rs
+++ b/fish-rust/src/tests/env_universal_common.rs
@@ -2,7 +2,6 @@ use crate::common::wcs2osstring;
use crate::common::ScopeGuard;
use crate::env::{EnvVar, EnvVarFlags, VarTable};
use crate::env_universal_common::{CallbackDataList, EnvUniversal, UvarFormat};
-use crate::flog::FLOG;
use crate::parser::Parser;
use crate::reader::{reader_current_data, reader_pop, reader_push, ReaderConfig};
use crate::tests::prelude::*;
diff --git a/fish-rust/src/tests/expand.rs b/fish-rust/src/tests/expand.rs
index ed5ce6472..61ba0f316 100644
--- a/fish-rust/src/tests/expand.rs
+++ b/fish-rust/src/tests/expand.rs
@@ -8,7 +8,6 @@ use crate::operation_context::{no_cancel, EXPANSION_LIMIT_DEFAULT};
use crate::parse_constants::ParseErrorList;
use crate::parser::Parser;
use crate::tests::prelude::*;
-use crate::tests::prelude::*;
use crate::wildcard::ANY_STRING;
use crate::{
expand::{expand_string, ExpandFlags},
diff --git a/fish-rust/src/tests/highlight.rs b/fish-rust/src/tests/highlight.rs
index 7d10a9474..bdcb04ff7 100644
--- a/fish-rust/src/tests/highlight.rs
+++ b/fish-rust/src/tests/highlight.rs
@@ -6,10 +6,7 @@ use crate::tests::prelude::*;
use crate::wchar::prelude::*;
use crate::{
env::EnvStack,
- highlight::{
- highlight_shell, is_potential_path, HighlightColorResolver, HighlightRole, HighlightSpec,
- PathFlags,
- },
+ highlight::{highlight_shell, is_potential_path, HighlightRole, HighlightSpec, PathFlags},
operation_context::{OperationContext, EXPANSION_LIMIT_BACKGROUND, EXPANSION_LIMIT_DEFAULT},
};
use libc::PATH_MAX;
diff --git a/fish-rust/src/tests/history.rs b/fish-rust/src/tests/history.rs
index 5cc18baaa..0d3e96c25 100644
--- a/fish-rust/src/tests/history.rs
+++ b/fish-rust/src/tests/history.rs
@@ -1,19 +1,16 @@
-use crate::common::{
- cstr2wcstring, is_windows_subsystem_for_linux, str2wcstring, wcs2osstring, wcs2string,
-};
-use crate::env::{EnvDyn, EnvMode, EnvStack, Environment};
+use crate::common::{is_windows_subsystem_for_linux, str2wcstring, wcs2osstring};
+use crate::env::{EnvMode, EnvStack};
use crate::fds::{wopen_cloexec, AutoCloseFd};
use crate::history::{self, History, HistoryItem, HistorySearch, PathList, SearchDirection};
use crate::path::path_get_data;
use crate::tests::prelude::*;
-use crate::tests::prelude::*;
use crate::tests::string_escape::ESCAPE_TEST_CHAR;
use crate::wchar::prelude::*;
use crate::wcstringutil::{string_prefixes_string, string_prefixes_string_case_insensitive};
-use libc::{O_RDONLY, STDERR_FILENO};
+use libc::O_RDONLY;
use rand::random;
use std::collections::VecDeque;
-use std::ffi::{CString, OsStr, OsString};
+use std::ffi::CString;
use std::io::BufReader;
use std::time::SystemTime;
use std::time::UNIX_EPOCH;
diff --git a/fish-rust/src/tests/mod.rs b/fish-rust/src/tests/mod.rs
index f13961092..21388c0cc 100644
--- a/fish-rust/src/tests/mod.rs
+++ b/fish-rust/src/tests/mod.rs
@@ -1,5 +1,3 @@
-use crate::wchar::prelude::*;
-
mod abbrs;
mod common;
mod complete;
diff --git a/fish-rust/src/tests/parser.rs b/fish-rust/src/tests/parser.rs
index 9cf8aac9a..f76352c92 100644
--- a/fish-rust/src/tests/parser.rs
+++ b/fish-rust/src/tests/parser.rs
@@ -1,5 +1,4 @@
use crate::ast::{self, Ast, List, Node, Traversal};
-use crate::builtins::shared::{STATUS_CMD_OK, STATUS_UNMATCHED_WILDCARD};
use crate::common::ScopeGuard;
use crate::expand::ExpandFlags;
use crate::io::{IoBufferfill, IoChain};
@@ -13,7 +12,6 @@ use crate::reader::{
};
use crate::signal::{signal_clear_cancel, signal_reset_handlers, signal_set_handlers};
use crate::tests::prelude::*;
-use crate::tests::prelude::*;
use crate::threads::{iothread_drain_all, iothread_perform};
use crate::wchar::prelude::*;
use crate::wcstringutil::join_strings;
diff --git a/fish-rust/src/wutil/mod.rs b/fish-rust/src/wutil/mod.rs
index c4abe5f71..fa2d02254 100644
--- a/fish-rust/src/wutil/mod.rs
+++ b/fish-rust/src/wutil/mod.rs
@@ -5,7 +5,6 @@ pub mod fileid;
pub mod gettext;
pub mod printf;
#[cfg(test)]
-#[allow(unused_imports)] // Easy way to suppress warnings while we have two testing modes.
mod tests;
pub mod wcstod;
pub mod wcstoi;
diff --git a/fish-rust/src/wutil/tests.rs b/fish-rust/src/wutil/tests.rs
index c13ac9461..3caae3bda 100644
--- a/fish-rust/src/wutil/tests.rs
+++ b/fish-rust/src/wutil/tests.rs
@@ -4,7 +4,6 @@ use rand::random;
use std::{ffi::CString, ptr};
use crate::fallback::fish_mkstemp_cloexec;
-use crate::tests::prelude::*;
use super::*;