github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-01 22:18:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some unnecessary imports and suppress unused import warnings

Browse Source
This commit is contained in:
ridiculousfish 2023-12-28 21:12:36 -08:00
parent 534c00bdbf
commit 2a46b24526
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fish-rust/src/ffi.rs
View File

@ -4,7 +4,6 @@ use crate::wchar;
use ::std::pin::Pin;
#[rustfmt::skip]
use ::std::slice;
pub use crate::wait_handle::{WaitHandleRef, WaitHandleStore};
use crate::wchar::prelude::*;
use crate::wchar_ffi::WCharFromFFI;
use autocxx::prelude::*;
@ -16,7 +15,6 @@ include_cpp! {
#include "autoload.h"
#include "color.h"
#include "common.h"
#include "complete.h"
#include "env.h"
#include "env_dispatch.h"
#include "env_universal_common.h"
@ -26,8 +24,6 @@ include_cpp! {
#include "fds.h"
#include "flog.h"
#include "function.h"
#include "highlight.h"
#include "history.h"
#include "io.h"
#include "input_common.h"
#include "input.h"
@ -49,7 +45,6 @@ include_cpp! {
generate_pod!("wcharz_t")
generate!("wcstring_list_ffi_t")
generate!("wperror")
generate!("set_inheriteds_ffi")
generate!("reader_init")
@ -64,7 +59,6 @@ include_cpp! {
generate!("set_flog_output_file_ffi")
generate!("flog_setlinebuf_ffi")
generate!("activate_flog_categories_by_pattern")
generate!("save_term_foreground_process_group")
generate!("restore_term_foreground_process_group_for_exit")
generate!("builtin_bind")
@ -78,7 +72,6 @@ include_cpp! {
generate!("wgettext_ptr")
generate!("highlight_role_t")
generate!("highlight_spec_t")
generate!("rgb_color_t")
@ -158,9 +151,7 @@ impl Repin for wcstring_list_ffi_t {}
impl Repin for rgb_color_t {}
impl Repin for OutputStreamFfi<'_> {}
pub use autocxx::c_int;
pub use ffi::*;
pub use libc::c_char;
/// A version of [`* const core::ffi::c_void`] (or [`* const libc::c_void`], if you prefer) that
/// implements `Copy` and `Clone`, because those two don't. Used to represent a `void *` ptr for ffi

1
fish-rust/src/lib.rs
View File

@ -54,6 +54,7 @@ mod fds;
#[allow(clippy::new_ret_no_self)]
#[allow(clippy::wrong_self_convention)]
#[allow(clippy::needless_lifetimes)]
#[allow(unused_imports)]
mod ffi;
mod ffi_init;
mod ffi_tests;

2
fish-rust/src/wchar.rs
View File

@ -8,7 +8,7 @@ use crate::common::{ENCODE_DIRECT_BASE, ENCODE_DIRECT_END};
pub use widestring::{Utf32Str as wstr, Utf32String as WString};
/// Pull in our extensions.
pub use crate::wchar_ext::{IntoCharIter, WExt};
pub use crate::wchar_ext::IntoCharIter;
pub(crate) mod prelude {
pub(crate) use crate::{

2
fish-rust/src/wutil/dir_iter.rs
View File

@ -1,4 +1,3 @@
use super::wcstoi;
use super::wopendir;
use crate::common::{cstr2wcstring, wcs2zstring};
use crate::wchar::{wstr, WString};
@ -13,7 +12,6 @@ use std::os::fd::RawFd;
use std::ptr::NonNull;
use std::rc::Rc;
use std::slice;
pub use wcstoi::*;
/// Types of files that may be in a directory.
#[derive(Clone, Copy, Debug, Eq, PartialEq)]