derive: copy path_clean::clean() and pathdiff::diff_paths()

The function `clean()` was copied from the project [`path_clean`] in version 1.0.1 (rev. [`d8948ae`]).
License: MIT OR Apache-2.0.
Authors: Dan Reeves <hey@danreev.es>, Alex Guerra <alex@heyimalex.com>, Adam Reichold

The function `diff_paths()` was copied in from the project [`pathdiff`] in version 0.2.3 (rev. [`5180ff5`]).
License: MIT OR Apache-2.0.
Copyright 2012-2015 The Rust Project Developers.

Please see their commit history for more information.

[`path_clean`]: <https://github.com/danreeves/path-clean>
[`pathdiff`]: <https://github.com/Manishearth/pathdiff>
[`d8948ae`]: <d8948ae69d/src/lib.rs (L50-L86)>
[`5180ff5`]: <5180ff5b23/src/lib.rs (L18-L86)>
This commit is contained in:
René Kijewski 2025-07-30 19:02:25 +02:00
parent d670d9b91c
commit e1fb7ee98b
2 changed files with 125 additions and 1 deletions

View File

@ -1,3 +1,5 @@
mod macro_invocation;
mod paths;
pub(crate) use macro_invocation::*;
pub(crate) use macro_invocation::MacroInvocation;
pub(crate) use paths::{clean as clean_path, diff_paths};

View File

@ -0,0 +1,122 @@
use std::path::{Component, Path, PathBuf};
// The function [`clean()`] was copied from the project [`path_clean`] in version 1.0.1 (rev. [`d8948ae`]).
// License: MIT OR Apache-2.0.
// Authors: Dan Reeves <hey@danreev.es>, Alex Guerra <alex@heyimalex.com>, Adam Reichold
//
// The function [`diff_paths()`] was copied in from the project [`pathdiff`] in version 0.2.3 (rev. [`5180ff5`]).
// License: MIT OR Apache-2.0.
// Copyright 2012-2015 The Rust Project Developers.
//
// Please see their commit history for more information.
//
// [`path_clean`]: <https://github.com/danreeves/path-clean>
// [`pathdiff`]: <https://github.com/Manishearth/pathdiff>
// [`d8948ae`]: <https://github.com/danreeves/path-clean/blob/d8948ae69d349ec33dfe6d6b9c6a0fe30288a117/src/lib.rs#L50-L86>
// [`5180ff5`]: <https://github.com/Manishearth/pathdiff/blob/5180ff5b23d9d7eef0a14de13a3d814eb5d8d65c/src/lib.rs#L18-L86>
/// The core implementation. It performs the following, lexically:
/// 1. Reduce multiple slashes to a single slash.
/// 2. Eliminate `.` path name elements (the current directory).
/// 3. Eliminate `..` path name elements (the parent directory) and the non-`.` non-`..`, element that precedes them.
/// 4. Eliminate `..` elements that begin a rooted path, that is, replace `/..` by `/` at the beginning of a path.
/// 5. Leave intact `..` elements that begin a non-rooted path.
///
/// If the result of this process is an empty string, return the string `"."`, representing the current directory.
pub(crate) fn clean<P>(path: P) -> PathBuf
where
P: AsRef<Path>,
{
let mut out = Vec::new();
for comp in path.as_ref().components() {
match comp {
Component::CurDir => (),
Component::ParentDir => match out.last() {
Some(Component::RootDir) => (),
Some(Component::Normal(_)) => {
out.pop();
}
None
| Some(Component::CurDir)
| Some(Component::ParentDir)
| Some(Component::Prefix(_)) => out.push(comp),
},
comp => out.push(comp),
}
}
if !out.is_empty() {
out.iter().collect()
} else {
PathBuf::from(".")
}
}
/// Construct a relative path from a provided base directory path to the provided path.
///
/// ```rust
/// use pathdiff::diff_paths;
/// use std::path::*;
///
/// assert_eq!(diff_paths("/foo/bar", "/foo/bar/baz"), Some("../".into()));
/// assert_eq!(diff_paths("/foo/bar/baz", "/foo/bar"), Some("baz".into()));
/// assert_eq!(diff_paths("/foo/bar/quux", "/foo/bar/baz"), Some("../quux".into()));
/// assert_eq!(diff_paths("/foo/bar/baz", "/foo/bar/quux"), Some("../baz".into()));
/// assert_eq!(diff_paths("/foo/bar", "/foo/bar/quux"), Some("../".into()));
///
/// assert_eq!(diff_paths("/foo/bar", "baz"), Some("/foo/bar".into()));
/// assert_eq!(diff_paths("/foo/bar", "/baz"), Some("../foo/bar".into()));
/// assert_eq!(diff_paths("foo", "bar"), Some("../foo".into()));
///
/// assert_eq!(
/// diff_paths(&"/foo/bar/baz", "/foo/bar".to_string()),
/// Some("baz".into())
/// );
/// assert_eq!(
/// diff_paths(Path::new("/foo/bar/baz"), Path::new("/foo/bar").to_path_buf()),
/// Some("baz".into())
/// );
/// ```
pub(crate) fn diff_paths<P, B>(path: P, base: B) -> Option<PathBuf>
where
P: AsRef<Path>,
B: AsRef<Path>,
{
let path = path.as_ref();
let base = base.as_ref();
if path.is_absolute() != base.is_absolute() {
if path.is_absolute() {
Some(PathBuf::from(path))
} else {
None
}
} else {
let mut ita = path.components();
let mut itb = base.components();
let mut comps = vec![];
loop {
match (ita.next(), itb.next()) {
(None, None) => break,
(Some(a), None) => {
comps.push(a);
comps.extend(ita.by_ref());
break;
}
(None, _) => comps.push(Component::ParentDir),
(Some(a), Some(b)) if comps.is_empty() && a == b => (),
(Some(a), Some(b)) if b == Component::CurDir => comps.push(a),
(Some(_), Some(b)) if b == Component::ParentDir => return None,
(Some(a), Some(_)) => {
comps.push(Component::ParentDir);
for _ in itb {
comps.push(Component::ParentDir);
}
comps.push(a);
comps.extend(ita.by_ref());
break;
}
}
}
Some(comps.iter().map(|c| c.as_os_str()).collect())
}
}