h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-09 12:11:20 -03:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Extract config path module. NFC

Browse Source 
Fix cargo (non-cmake) build.
This commit is contained in:
Johannes Altmanninger
2025-06-13 12:17:04 +02:00
parent 6fd0025f38
commit 4be17bfefb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/fish.rs
View File

@@ -22,7 +22,7 @@
#![allow(clippy::uninlined_format_args)] #![allow(clippy::uninlined_format_args)]
#[cfg(feature = "installable")] #[cfg(feature = "installable")]
use fish::common::get_executable_path; use fish::common::{get_executable_path, wcs2osstring};
#[allow(unused_imports)] #[allow(unused_imports)]
use fish::future::IsSomeAnd; use fish::future::IsSomeAnd;
use fish::{ use fish::{
@@ -293,7 +293,6 @@ fn source_config_in_directory(parser: &Parser, dir: &wstr) -> bool {
#[cfg(feature = "installable")] #[cfg(feature = "installable")]
fn check_version_file(paths: &ConfigPaths, datapath: &wstr) -> Option<bool> { fn check_version_file(paths: &ConfigPaths, datapath: &wstr) -> Option<bool> {
use crate::common::wcs2osstring;
// (false-positive, is_none_or is a backport, this builds with 1.70) // (false-positive, is_none_or is a backport, this builds with 1.70)
#[allow(clippy::incompatible_msrv)] #[allow(clippy::incompatible_msrv)]
if paths if paths