Merge branch 'fix_nix_build_image_paths'
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
use std::path::NormalizeError;
|
||||
use std::str::Utf8Error;
|
||||
use std::string::FromUtf8Error;
|
||||
|
||||
@@ -16,6 +17,7 @@ pub(crate) enum CustomError {
|
||||
DusterRender(#[allow(dead_code)] duster::renderer::RenderError),
|
||||
PathStripPrefix(#[allow(dead_code)] std::path::StripPrefixError),
|
||||
UrlParseError(#[allow(dead_code)] url::ParseError),
|
||||
NormalizeError(#[allow(dead_code)] NormalizeError),
|
||||
}
|
||||
|
||||
impl From<std::io::Error> for CustomError {
|
||||
@@ -95,3 +97,9 @@ impl From<url::ParseError> for CustomError {
|
||||
CustomError::UrlParseError(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<NormalizeError> for CustomError {
|
||||
fn from(value: NormalizeError) -> Self {
|
||||
CustomError::NormalizeError(value)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,7 +151,7 @@ impl LinkTarget {
|
||||
.unwrap()
|
||||
.get_current_folder()?
|
||||
.join(src)
|
||||
.canonicalize()?;
|
||||
.normalize_lexically()?;
|
||||
let input_root_directory = render_context.config.get_root_directory();
|
||||
let relative_path_to_file = path_to_file.strip_prefix(input_root_directory)?;
|
||||
let web_path = get_web_path(
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#![feature(normalize_lexically)]
|
||||
use std::process::ExitCode;
|
||||
|
||||
use clap::Parser;
|
||||
|
||||
Reference in New Issue
Block a user