c4e9857ebd
Previously, we used `fs::canonicalize` to ensure paths used in search were absolute. This lead to bad behavior when the justfile was symbolic link to a file in another directory. Additionally, on Windows, this produced paths in extended length syntax, which, I believe, has compatibility issues. This diff replaces uses of `fs::canonicalize` with a simpler algorithm that roots path in the invocation directory (which will be a no-op if said path is already absolute), uses `Path::components` to remove extra `/` and `.`, and resolves instances of `..` without following symlinks, by removing the `..` and the component that proceeds it.
72 lines
2.7 KiB
Rust
72 lines
2.7 KiB
Rust
// stdlib
|
|
pub(crate) use std::{
|
|
borrow::Cow,
|
|
cmp,
|
|
collections::{BTreeMap, BTreeSet},
|
|
env,
|
|
fmt::{self, Display, Formatter},
|
|
fs,
|
|
io::{self, Write},
|
|
iter::{self, FromIterator},
|
|
ops::{Deref, Range, RangeInclusive},
|
|
path::{Path, PathBuf},
|
|
process::{self, Command},
|
|
str::{self, Chars},
|
|
sync::{Mutex, MutexGuard},
|
|
usize, vec,
|
|
};
|
|
|
|
// modules used in tests
|
|
#[cfg(test)]
|
|
pub(crate) use crate::testing;
|
|
|
|
// structs and enums used in tests
|
|
#[cfg(test)]
|
|
pub(crate) use crate::{node::Node, tree::Tree};
|
|
|
|
// dependencies
|
|
pub(crate) use edit_distance::edit_distance;
|
|
pub(crate) use libc::EXIT_FAILURE;
|
|
pub(crate) use log::warn;
|
|
pub(crate) use snafu::{ResultExt, Snafu};
|
|
pub(crate) use unicode_width::UnicodeWidthChar;
|
|
|
|
// modules
|
|
pub(crate) use crate::{config_error, keyword, setting};
|
|
|
|
// functions
|
|
pub(crate) use crate::{default::default, empty::empty, load_dotenv::load_dotenv, output::output};
|
|
|
|
// traits
|
|
pub(crate) use crate::{
|
|
command_ext::CommandExt, compilation_result_ext::CompilationResultExt, error::Error,
|
|
error_result_ext::ErrorResultExt, keyed::Keyed, ordinal::Ordinal,
|
|
platform_interface::PlatformInterface, range_ext::RangeExt,
|
|
};
|
|
|
|
// structs and enums
|
|
pub(crate) use crate::{
|
|
alias::Alias, alias_resolver::AliasResolver, analyzer::Analyzer, assignment::Assignment,
|
|
assignment_evaluator::AssignmentEvaluator, assignment_resolver::AssignmentResolver, color::Color,
|
|
compilation_error::CompilationError, compilation_error_kind::CompilationErrorKind,
|
|
compiler::Compiler, config::Config, config_error::ConfigError, count::Count,
|
|
enclosure::Enclosure, expression::Expression, fragment::Fragment, function::Function,
|
|
function_context::FunctionContext, functions::Functions, interrupt_guard::InterruptGuard,
|
|
interrupt_handler::InterruptHandler, item::Item, justfile::Justfile, lexer::Lexer, line::Line,
|
|
list::List, load_error::LoadError, module::Module, name::Name, output_error::OutputError,
|
|
parameter::Parameter, parser::Parser, platform::Platform, position::Position,
|
|
positional::Positional, recipe::Recipe, recipe_context::RecipeContext,
|
|
recipe_resolver::RecipeResolver, runtime_error::RuntimeError, search::Search,
|
|
search_config::SearchConfig, search_error::SearchError, set::Set, setting::Setting,
|
|
settings::Settings, shebang::Shebang, show_whitespace::ShowWhitespace, state::State,
|
|
string_literal::StringLiteral, subcommand::Subcommand, table::Table, token::Token,
|
|
token_kind::TokenKind, use_color::UseColor, variables::Variables, verbosity::Verbosity,
|
|
warning::Warning,
|
|
};
|
|
|
|
// type aliases
|
|
pub(crate) type CompilationResult<'a, T> = Result<T, CompilationError<'a>>;
|
|
pub(crate) type ConfigResult<T> = Result<T, ConfigError>;
|
|
pub(crate) type RunResult<'a, T> = Result<T, RuntimeError<'a>>;
|
|
pub(crate) type SearchResult<T> = Result<T, SearchError>;
|