mercurial-scm/hg-stable: rust/hg-core/src/utils/hg

annotate rust/hg-core/src/utils/hg_path.rs @ 46503:2e2033081274

rust: replace trivial `impl From ?` with `#[derive(derive_more::From)]` Crate docs: https://jeltef.github.io/derive_more/derive_more/from.html Differential Revision: https://phab.mercurial-scm.org/D9875

author	Simon Sapin <simon.sapin@octobus.net>
date	Tue, 26 Jan 2021 20:05:37 +0100
parents	2d5dfc8fed55
children	6c778d20c8c2

rev	line source
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // hg_path.rs
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 use std::borrow::Borrow;
45544 2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	9 use std::convert::TryFrom;
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	10 use std::ffi::{OsStr, OsString};
43845 c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	11 use std::fmt;
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	12 use std::ops::Deref;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	13 use std::path::{Path, PathBuf};
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	14
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	15 #[derive(Debug, Eq, PartialEq)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	16 pub enum HgPathError {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	17 /// Bytes from the invalid `HgPath`
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	18 LeadingSlash(Vec<u8>),
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	19 ConsecutiveSlashes {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	20 bytes: Vec<u8>,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	21 second_slash_index: usize,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	22 },
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	23 ContainsNullByte {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	24 bytes: Vec<u8>,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	25 null_byte_index: usize,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	26 },
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 /// Bytes
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 DecodeError(Vec<u8>),
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	29 /// The rest come from audit errors
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	30 EndsWithSlash(HgPathBuf),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	31 ContainsIllegalComponent(HgPathBuf),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	32 /// Path is inside the `.hg` folder
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	33 InsideDotHg(HgPathBuf),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	34 IsInsideNestedRepo {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	35 path: HgPathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	36 nested_repo: HgPathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	37 },
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	38 TraversesSymbolicLink {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	39 path: HgPathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	40 symlink: HgPathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	41 },
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	42 NotFsCompliant(HgPathBuf),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	43 /// `path` is the smallest invalid path
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	44 NotUnderRoot {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	45 path: PathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	46 root: PathBuf,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	47 },
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	48 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	50 impl ToString for HgPathError {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	51 fn to_string(&self) -> String {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	52 match self {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	53 HgPathError::LeadingSlash(bytes) => {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	54 format!("Invalid HgPath '{:?}': has a leading slash.", bytes)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	55 }
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	56 HgPathError::ConsecutiveSlashes {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	57 bytes,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	58 second_slash_index: pos,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	59 } => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	60 "Invalid HgPath '{:?}': consecutive slashes at pos {}.",
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 bytes, pos
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62 ),
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	63 HgPathError::ContainsNullByte {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	64 bytes,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	65 null_byte_index: pos,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	66 } => format!(
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	67 "Invalid HgPath '{:?}': contains null byte at pos {}.",
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	68 bytes, pos
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 ),
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 HgPathError::DecodeError(bytes) => {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 format!("Invalid HgPath '{:?}': could not be decoded.", bytes)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 }
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	73 HgPathError::EndsWithSlash(path) => {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	74 format!("Audit failed for '{}': ends with a slash.", path)
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	75 }
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	76 HgPathError::ContainsIllegalComponent(path) => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	77 "Audit failed for '{}': contains an illegal component.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	78 path
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	79 ),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	80 HgPathError::InsideDotHg(path) => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	81 "Audit failed for '{}': is inside the '.hg' folder.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	82 path
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	83 ),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	84 HgPathError::IsInsideNestedRepo {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	85 path,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	86 nested_repo: nested,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	87 } => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	88 "Audit failed for '{}': is inside a nested repository '{}'.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	89 path, nested
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	90 ),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	91 HgPathError::TraversesSymbolicLink { path, symlink } => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	92 "Audit failed for '{}': traverses symbolic link '{}'.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	93 path, symlink
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	94 ),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	95 HgPathError::NotFsCompliant(path) => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	96 "Audit failed for '{}': cannot be turned into a \
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	97 filesystem path.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	98 path
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	99 ),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	100 HgPathError::NotUnderRoot { path, root } => format!(
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	101 "Audit failed for '{}': not under root {}.",
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	102 path.display(),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	103 root.display()
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	104 ),
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	105 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	106 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	107 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	108
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	109 impl From<HgPathError> for std::io::Error {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	110 fn from(e: HgPathError) -> Self {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	111 std::io::Error::new(std::io::ErrorKind::InvalidData, e.to_string())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 /// This is a repository-relative path (or canonical path):
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 /// - no null characters
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 /// - `/` separates directories
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 /// - no consecutive slashes
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119 /// - no leading slash,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120 /// - no `.` nor `..` of special meaning
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 /// - stored in repository and shared across platforms
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122 ///
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 /// Note: there is no guarantee of any `HgPath` being well-formed at any point
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 /// in its lifetime for performance reasons and to ease ergonomics. It is
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 /// however checked using the `check_state` method before any file-system
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	126 /// operation.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	127 ///
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 /// This allows us to be encoding-transparent as much as possible, until really
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 /// needed; `HgPath` can be transformed into a platform-specific path (`OsStr`
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 /// or `Path`) whenever more complex operations are needed:
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 /// On Unix, it's just byte-to-byte conversion. On Windows, it has to be
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 /// decoded from MBCS to WTF-8. If WindowsUTF8Plan is implemented, the source
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	133 /// character encoding will be determined on a per-repository basis.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	134 //
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	135 // FIXME: (adapted from a comment in the stdlib)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 // `HgPath::new()` current implementation relies on `Slice` being
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	137 // layout-compatible with `[u8]`.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	138 // When attribute privacy is implemented, `Slice` should be annotated as
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	139 // `#[repr(transparent)]`.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140 // Anyway, `Slice` representation and layout are considered implementation
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	141 // detail, are not documented and must not be relied upon.
43914 4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	142 #[derive(Eq, Ord, PartialEq, PartialOrd, Hash)]
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	143 pub struct HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	144 inner: [u8],
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	145 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	146
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147 impl HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	148 pub fn new<S: AsRef<[u8]> + ?Sized>(s: &S) -> &Self {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 unsafe { &(s.as_ref() as const [u8] as *const Self) }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	150 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	151 pub fn is_empty(&self) -> bool {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	152 self.inner.is_empty()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	154 pub fn len(&self) -> usize {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	155 self.inner.len()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	156 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 fn to_hg_path_buf(&self) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158 HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	159 inner: self.inner.to_owned(),
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	160 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162 pub fn bytes(&self) -> std::slice::Iter<u8> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 self.inner.iter()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 pub fn to_ascii_uppercase(&self) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166 HgPathBuf::from(self.inner.to_ascii_uppercase())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168 pub fn to_ascii_lowercase(&self) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 HgPathBuf::from(self.inner.to_ascii_lowercase())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	170 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 pub fn as_bytes(&self) -> &[u8] {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172 &self.inner
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 pub fn contains(&self, other: u8) -> bool {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 self.inner.contains(&other)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	176 }
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	177 pub fn starts_with(&self, needle: impl AsRef<Self>) -> bool {
43851 4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	178 self.inner.starts_with(needle.as_ref().as_bytes())
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	179 }
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	180 pub fn trim_trailing_slash(&self) -> &Self {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	181 Self::new(if self.inner.last() == Some(&b'/') {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	182 &self.inner[..self.inner.len() - 1]
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	183 } else {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	184 &self.inner[..]
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	185 })
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	186 }
44314 0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	187 /// Returns a tuple of slices `(base, filename)` resulting from the split
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	188 /// at the rightmost `/`, if any.
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	189 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	190 /// # Examples:
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	191 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	192 /// ```
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	193 /// use hg::utils::hg_path::HgPath;
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	194 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	195 /// let path = HgPath::new(b"cool/hg/path").split_filename();
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	196 /// assert_eq!(path, (HgPath::new(b"cool/hg"), HgPath::new(b"path")));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	197 ///
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	198 /// let path = HgPath::new(b"pathwithoutsep").split_filename();
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	199 /// assert_eq!(path, (HgPath::new(b""), HgPath::new(b"pathwithoutsep")));
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	200 /// ```
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	201 pub fn split_filename(&self) -> (&Self, &Self) {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	202 match &self.inner.iter().rposition(\|c\| *c == b'/') {
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	203 None => (HgPath::new(""), &self),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	204 Some(size) => (
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	205 HgPath::new(&self.inner[..*size]),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	206 HgPath::new(&self.inner[*size + 1..]),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	207 ),
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	208 }
0e9ac3968b56 rust-dirs-multiset: add `DirsChildrenMultiset` Rapha?l Gom?s <rgomes@octobus.net> parents: 44313 diff changeset	209 }
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	210 pub fn join<T: ?Sized + AsRef<Self>>(&self, other: &T) -> HgPathBuf {
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	211 let mut inner = self.inner.to_owned();
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	212 if !inner.is_empty() && inner.last() != Some(&b'/') {
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	213 inner.push(b'/');
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	214 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	215 inner.extend(other.as_ref().bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	216 HgPathBuf::from_bytes(&inner)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	217 }
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	218 pub fn parent(&self) -> &Self {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	219 let inner = self.as_bytes();
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	220 HgPath::new(match inner.iter().rposition(\|b\| *b == b'/') {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	221 Some(pos) => &inner[..pos],
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	222 None => &[],
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	223 })
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	224 }
43851 4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	225 /// Given a base directory, returns the slice of `self` relative to the
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	226 /// base directory. If `base` is not a directory (does not end with a
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	227 /// `b'/'`), returns `None`.
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	228 pub fn relative_to(&self, base: impl AsRef<Self>) -> Option<&Self> {
43851 4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	229 let base = base.as_ref();
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	230 if base.is_empty() {
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	231 return Some(self);
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	232 }
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	233 let is_dir = base.as_bytes().ends_with(b"/");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	234 if is_dir && self.starts_with(base) {
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	235 Some(Self::new(&self.inner[base.len()..]))
43851 4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	236 } else {
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	237 None
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	238 }
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	239 }
44221 baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	240
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	241 #[cfg(windows)]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	242 /// Copied from the Python stdlib's `os.path.splitdrive` implementation.
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	243 ///
44266 732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	244 /// Split a pathname into drive/UNC sharepoint and relative path
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	245 /// specifiers. Returns a 2-tuple (drive_or_unc, path); either part may
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	246 /// be empty.
44221 baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	247 ///
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	248 /// If you assign
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	249 /// result = split_drive(p)
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	250 /// It is always true that:
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	251 /// result[0] + result[1] == p
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	252 ///
44266 732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	253 /// If the path contained a drive letter, drive_or_unc will contain
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	254 /// everything up to and including the colon.
44221 baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	255 /// e.g. split_drive("c:/dir") returns ("c:", "/dir")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	256 ///
44266 732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	257 /// If the path contained a UNC path, the drive_or_unc will contain the
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	258 /// host name and share up to but not including the fourth directory
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	259 /// separator character.
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	260 /// e.g. split_drive("//host/computer/dir") returns ("//host/computer",
732098027b34 rust: re-format with nightly rustfmt Martin von Zweigbergk <martinvonz@google.com> parents: 44221 diff changeset	261 /// "/dir")
44221 baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	262 ///
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	263 /// Paths cannot contain both a drive letter and a UNC path.
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	264 pub fn split_drive<'a>(&self) -> (&HgPath, &HgPath) {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	265 let bytes = self.as_bytes();
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	266 let is_sep = \|b\| std::path::is_separator(b as char);
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	267
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	268 if self.len() < 2 {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	269 (HgPath::new(b""), &self)
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	270 } else if is_sep(bytes[0])
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	271 && is_sep(bytes[1])
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	272 && (self.len() == 2 \|\| !is_sep(bytes[2]))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	273 {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	274 // Is a UNC path:
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	275 // vvvvvvvvvvvvvvvvvvvv drive letter or UNC path
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	276 // \\machine\mountpoint\directory\etc\...
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	277 // directory ^^^^^^^^^^^^^^^
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	278
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	279 let machine_end_index = bytes[2..].iter().position(\|b\| is_sep(*b));
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	280 let mountpoint_start_index = if let Some(i) = machine_end_index {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	281 i + 2
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	282 } else {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	283 return (HgPath::new(b""), &self);
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	284 };
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	285
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	286 match bytes[mountpoint_start_index + 1..]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	287 .iter()
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	288 .position(\|b\| is_sep(*b))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	289 {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	290 // A UNC path can't have two slashes in a row
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	291 // (after the initial two)
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	292 Some(0) => (HgPath::new(b""), &self),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	293 Some(i) => {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	294 let (a, b) =
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	295 bytes.split_at(mountpoint_start_index + 1 + i);
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	296 (HgPath::new(a), HgPath::new(b))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	297 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	298 None => (&self, HgPath::new(b"")),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	299 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	300 } else if bytes[1] == b':' {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	301 // Drive path c:\directory
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	302 let (a, b) = bytes.split_at(2);
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	303 (HgPath::new(a), HgPath::new(b))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	304 } else {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	305 (HgPath::new(b""), &self)
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	306 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	307 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	308
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	309 #[cfg(unix)]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	310 /// Split a pathname into drive and path. On Posix, drive is always empty.
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	311 pub fn split_drive(&self) -> (&HgPath, &HgPath) {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	312 (HgPath::new(b""), &self)
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	313 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	314
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	315 /// Checks for errors in the path, short-circuiting at the first one.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	316 /// This generates fine-grained errors useful for debugging.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	317 /// To simply check if the path is valid during tests, use `is_valid`.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	318 pub fn check_state(&self) -> Result<(), HgPathError> {
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	319 if self.is_empty() {
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	320 return Ok(());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	321 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	322 let bytes = self.as_bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	323 let mut previous_byte = None;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	324
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	325 if bytes[0] == b'/' {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	326 return Err(HgPathError::LeadingSlash(bytes.to_vec()));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	327 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	328 for (index, byte) in bytes.iter().enumerate() {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	329 match byte {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	330 0 => {
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	331 return Err(HgPathError::ContainsNullByte {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	332 bytes: bytes.to_vec(),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	333 null_byte_index: index,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	334 })
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	335 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	336 b'/' => {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	337 if previous_byte.is_some() && previous_byte == Some(b'/') {
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	338 return Err(HgPathError::ConsecutiveSlashes {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	339 bytes: bytes.to_vec(),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	340 second_slash_index: index,
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	341 });
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	342 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	343 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	344 _ => (),
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 };
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346 previous_byte = Some(*byte);
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	348 Ok(())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	349 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	350
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	351 #[cfg(test)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	352 /// Only usable during tests to force developers to handle invalid states
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	353 fn is_valid(&self) -> bool {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	354 self.check_state().is_ok()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	355 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	357
43914 4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	358 impl fmt::Debug for HgPath {
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	359 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	360 write!(f, "HgPath({:?})", String::from_utf8_lossy(&self.inner))
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	361 }
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	362 }
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	363
43845 c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	364 impl fmt::Display for HgPath {
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	365 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	366 write!(f, "{}", String::from_utf8_lossy(&self.inner))
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	367 }
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	368 }
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	369
46503 2e2033081274 rust: replace trivial `impl From ?` with `#[derive(derive_more::From)]` Simon Sapin <simon.sapin@octobus.net> parents: 45544 diff changeset	370 #[derive(
2e2033081274 rust: replace trivial `impl From ?` with `#[derive(derive_more::From)]` Simon Sapin <simon.sapin@octobus.net> parents: 45544 diff changeset	371 Default, Eq, Ord, Clone, PartialEq, PartialOrd, Hash, derive_more::From,
2e2033081274 rust: replace trivial `impl From ?` with `#[derive(derive_more::From)]` Simon Sapin <simon.sapin@octobus.net> parents: 45544 diff changeset	372 )]
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	373 pub struct HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	374 inner: Vec<u8>,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	377 impl HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378 pub fn new() -> Self {
44998 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44314 diff changeset	379 Default::default()
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	380 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	381 pub fn push(&mut self, byte: u8) {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	382 self.inner.push(byte);
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	383 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	384 pub fn from_bytes(s: &[u8]) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	385 HgPath::new(s).to_owned()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	386 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	387 pub fn into_vec(self) -> Vec<u8> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	388 self.inner
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	389 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	390 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	391
43914 4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	392 impl fmt::Debug for HgPathBuf {
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	393 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	394 write!(f, "HgPathBuf({:?})", String::from_utf8_lossy(&self.inner))
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	395 }
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	396 }
4b3c8df189bc rust-hg-path: implement more readable custom Debug for HgPath{,Buf} Martin von Zweigbergk <martinvonz@google.com> parents: 43851 diff changeset	397
43845 c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	398 impl fmt::Display for HgPathBuf {
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	399 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	400 write!(f, "{}", String::from_utf8_lossy(&self.inner))
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	401 }
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	402 }
c27e688fcdc3 rust-hg-path: implement `Display` for `HgPath` and `HgPathBuf` Rapha?l Gom?s <rgomes@octobus.net> parents: 43250 diff changeset	403
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	404 impl Deref for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	405 type Target = HgPath;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	406
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	407 #[inline]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	408 fn deref(&self) -> &HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	409 &HgPath::new(&self.inner)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	410 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	411 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	412
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	413 impl<T: ?Sized + AsRef<HgPath>> From<&T> for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	414 fn from(s: &T) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	415 s.as_ref().to_owned()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	416 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	417 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	418
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	419 impl Into<Vec<u8>> for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	420 fn into(self) -> Vec<u8> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	421 self.inner
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	422 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	423 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	424
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	425 impl Borrow<HgPath> for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	426 fn borrow(&self) -> &HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	427 &HgPath::new(self.as_bytes())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	428 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	429 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	430
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	431 impl ToOwned for HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	432 type Owned = HgPathBuf;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	433
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	434 fn to_owned(&self) -> HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	435 self.to_hg_path_buf()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	436 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	437 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	438
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	439 impl AsRef<HgPath> for HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	440 fn as_ref(&self) -> &HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	441 self
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	442 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	443 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	444
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	445 impl AsRef<HgPath> for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	446 fn as_ref(&self) -> &HgPath {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	447 self
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	448 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	449 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	450
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	451 impl Extend<u8> for HgPathBuf {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	452 fn extend<T: IntoIterator<Item = u8>>(&mut self, iter: T) {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	453 self.inner.extend(iter);
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	454 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	455 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	456
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	457 /// TODO: Once https://www.mercurial-scm.org/wiki/WindowsUTF8Plan is
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	458 /// implemented, these conversion utils will have to work differently depending
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	459 /// on the repository encoding: either `UTF-8` or `MBCS`.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	460
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	461 pub fn hg_path_to_os_string<P: AsRef<HgPath>>(
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	462 hg_path: P,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	463 ) -> Result<OsString, HgPathError> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	464 hg_path.as_ref().check_state()?;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	465 let os_str;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	466 #[cfg(unix)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	467 {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	468 use std::os::unix::ffi::OsStrExt;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	469 os_str = std::ffi::OsStr::from_bytes(&hg_path.as_ref().as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	470 }
43250 98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	471 // TODO Handle other platforms
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	472 // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	473 Ok(os_str.to_os_string())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	474 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	475
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	476 pub fn hg_path_to_path_buf<P: AsRef<HgPath>>(
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	477 hg_path: P,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	478 ) -> Result<PathBuf, HgPathError> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	479 Ok(Path::new(&hg_path_to_os_string(hg_path)?).to_path_buf())
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	480 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	481
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	482 pub fn os_string_to_hg_path_buf<S: AsRef<OsStr>>(
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	483 os_string: S,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	484 ) -> Result<HgPathBuf, HgPathError> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	485 let buf;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	486 #[cfg(unix)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	487 {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	488 use std::os::unix::ffi::OsStrExt;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	489 buf = HgPathBuf::from_bytes(&os_string.as_ref().as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	490 }
43250 98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	491 // TODO Handle other platforms
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	492 // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	493
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	494 buf.check_state()?;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	495 Ok(buf)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	496 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	497
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	498 pub fn path_to_hg_path_buf<P: AsRef<Path>>(
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	499 path: P,
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	500 ) -> Result<HgPathBuf, HgPathError> {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	501 let buf;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	502 let os_str = path.as_ref().as_os_str();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	503 #[cfg(unix)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	504 {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	505 use std::os::unix::ffi::OsStrExt;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	506 buf = HgPathBuf::from_bytes(&os_str.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	507 }
43250 98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	508 // TODO Handle other platforms
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	509 // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
98d996a138de rust-cross-platform: remove `unimplemented!` to get compile-time errors Rapha?l Gom?s <rgomes@octobus.net> parents: 42959 diff changeset	510
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	511 buf.check_state()?;
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	512 Ok(buf)
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	513 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	514
45544 2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	515 impl TryFrom<PathBuf> for HgPathBuf {
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	516 type Error = HgPathError;
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	517 fn try_from(path: PathBuf) -> Result<Self, Self::Error> {
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	518 path_to_hg_path_buf(path)
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	519 }
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	520 }
2d5dfc8fed55 hg-core: impl TryFrom<PathBuff> for HgPathBuf Antoine Cezar <antoine.cezar@octobus.net> parents: 44998 diff changeset	521
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	522 #[cfg(test)]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	523 mod tests {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	524 use super::*;
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	525 use pretty_assertions::assert_eq;
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	526
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	527 #[test]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	528 fn test_path_states() {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	529 assert_eq!(
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	530 Err(HgPathError::LeadingSlash(b"/".to_vec())),
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	531 HgPath::new(b"/").check_state()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	532 );
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	533 assert_eq!(
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	534 Err(HgPathError::ConsecutiveSlashes {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	535 bytes: b"a/b//c".to_vec(),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	536 second_slash_index: 4
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	537 }),
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	538 HgPath::new(b"a/b//c").check_state()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	539 );
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	540 assert_eq!(
44312 c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	541 Err(HgPathError::ContainsNullByte {
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	542 bytes: b"a/b/\0c".to_vec(),
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	543 null_byte_index: 4
c18dd48cea4a rust-pathauditor: add Rust implementation of the `pathauditor` Rapha?l Gom?s <rgomes@octobus.net> parents: 44266 diff changeset	544 }),
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	545 HgPath::new(b"a/b/\0c").check_state()
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	546 );
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	547 // TODO test HgPathError::DecodeError for the Windows implementation.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	548 assert_eq!(true, HgPath::new(b"").is_valid());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	549 assert_eq!(true, HgPath::new(b"a/b/c").is_valid());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	550 // Backslashes in paths are not significant, but allowed
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	551 assert_eq!(true, HgPath::new(br"a\b/c").is_valid());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	552 // Dots in paths are not significant, but allowed
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	553 assert_eq!(true, HgPath::new(b"a/b/../c/").is_valid());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	554 assert_eq!(true, HgPath::new(b"./a/b/../c/").is_valid());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	555 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	556
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	557 #[test]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	558 fn test_iter() {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	559 let path = HgPath::new(b"a");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	560 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	561 assert_eq!(Some(&b'a'), iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	562 assert_eq!(None, iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	563 assert_eq!(None, iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	564
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	565 let path = HgPath::new(b"a");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	566 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	567 assert_eq!(Some(&b'a'), iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	568 assert_eq!(None, iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	569 assert_eq!(None, iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	570
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	571 let path = HgPath::new(b"abc");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	572 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	573 assert_eq!(Some(&b'a'), iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	574 assert_eq!(Some(&b'c'), iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	575 assert_eq!(Some(&b'b'), iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	576 assert_eq!(None, iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	577 assert_eq!(None, iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	578
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	579 let path = HgPath::new(b"abc");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	580 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	581 assert_eq!(Some(&b'a'), iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	582 assert_eq!(Some(&b'b'), iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	583 assert_eq!(Some(&b'c'), iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	584 assert_eq!(None, iter.next_back());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	585 assert_eq!(None, iter.next());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	586
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	587 let path = HgPath::new(b"abc");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	588 let iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	589 let mut vec = Vec::new();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	590 vec.extend(iter);
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	591 assert_eq!(vec![b'a', b'b', b'c'], vec);
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	592
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	593 let path = HgPath::new(b"abc");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	594 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	595 assert_eq!(Some(2), iter.rposition(\|c\| *c == b'c'));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	596
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	597 let path = HgPath::new(b"abc");
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	598 let mut iter = path.bytes();
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	599 assert_eq!(None, iter.rposition(\|c\| *c == b'd'));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	600 }
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	601
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	602 #[test]
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	603 fn test_join() {
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	604 let path = HgPathBuf::from_bytes(b"a").join(HgPath::new(b"b"));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	605 assert_eq!(b"a/b", path.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	606
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	607 let path = HgPathBuf::from_bytes(b"a/").join(HgPath::new(b"b/c"));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	608 assert_eq!(b"a/b/c", path.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	609
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	610 // No leading slash if empty before join
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	611 let path = HgPathBuf::new().join(HgPath::new(b"b/c"));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	612 assert_eq!(b"b/c", path.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	613
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	614 // The leading slash is an invalid representation of an `HgPath`, but
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	615 // it can happen. This creates another invalid representation of
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	616 // consecutive bytes.
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	617 // TODO What should be done in this case? Should we silently remove
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	618 // the extra slash? Should we change the signature to a problematic
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	619 // `Result<HgPathBuf, HgPathError>`, or should we just keep it so and
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	620 // let the error happen upon filesystem interaction?
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	621 let path = HgPathBuf::from_bytes(b"a/").join(HgPath::new(b"/b"));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	622 assert_eq!(b"a//b", path.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	623 let path = HgPathBuf::from_bytes(b"a").join(HgPath::new(b"/b"));
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	624 assert_eq!(b"a//b", path.as_bytes());
3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	625 }
43851 4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	626
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	627 #[test]
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	628 fn test_relative_to() {
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	629 let path = HgPath::new(b"");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	630 let base = HgPath::new(b"");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	631 assert_eq!(Some(path), path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	632
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	633 let path = HgPath::new(b"path");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	634 let base = HgPath::new(b"");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	635 assert_eq!(Some(path), path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	636
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	637 let path = HgPath::new(b"a");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	638 let base = HgPath::new(b"b");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	639 assert_eq!(None, path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	640
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	641 let path = HgPath::new(b"a/b");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	642 let base = HgPath::new(b"a");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	643 assert_eq!(None, path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	644
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	645 let path = HgPath::new(b"a/b");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	646 let base = HgPath::new(b"a/");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	647 assert_eq!(Some(HgPath::new(b"b")), path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	648
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	649 let path = HgPath::new(b"nested/path/to/b");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	650 let base = HgPath::new(b"nested/path/");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	651 assert_eq!(Some(HgPath::new(b"to/b")), path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	652
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	653 let path = HgPath::new(b"ends/with/dir/");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	654 let base = HgPath::new(b"ends/");
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	655 assert_eq!(Some(HgPath::new(b"with/dir/")), path.relative_to(base));
4f1543a2f5c3 rust-hg-path: add method to get part of a path relative to a prefix Rapha?l Gom?s <rgomes@octobus.net> parents: 43845 diff changeset	656 }
44221 baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	657
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	658 #[test]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	659 #[cfg(unix)]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	660 fn test_split_drive() {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	661 // Taken from the Python stdlib's tests
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	662 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	663 HgPath::new(br"/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	664 (HgPath::new(b""), HgPath::new(br"/foo/bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	665 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	666 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	667 HgPath::new(br"foo:bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	668 (HgPath::new(b""), HgPath::new(br"foo:bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	669 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	670 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	671 HgPath::new(br":foo:bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	672 (HgPath::new(b""), HgPath::new(br":foo:bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	673 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	674 // Also try NT paths; should not split them
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	675 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	676 HgPath::new(br"c:\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	677 (HgPath::new(b""), HgPath::new(br"c:\foo\bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	678 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	679 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	680 HgPath::new(b"c:/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	681 (HgPath::new(b""), HgPath::new(br"c:/foo/bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	682 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	683 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	684 HgPath::new(br"\\conky\mountpoint\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	685 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	686 HgPath::new(b""),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	687 HgPath::new(br"\\conky\mountpoint\foo\bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	688 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	689 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	690 }
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	691
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	692 #[test]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	693 #[cfg(windows)]
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	694 fn test_split_drive() {
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	695 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	696 HgPath::new(br"c:\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	697 (HgPath::new(br"c:"), HgPath::new(br"\foo\bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	698 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	699 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	700 HgPath::new(b"c:/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	701 (HgPath::new(br"c:"), HgPath::new(br"/foo/bar"))
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	702 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	703 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	704 HgPath::new(br"\\conky\mountpoint\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	705 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	706 HgPath::new(br"\\conky\mountpoint"),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	707 HgPath::new(br"\foo\bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	708 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	709 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	710 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	711 HgPath::new(br"//conky/mountpoint/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	712 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	713 HgPath::new(br"//conky/mountpoint"),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	714 HgPath::new(br"/foo/bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	715 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	716 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	717 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	718 HgPath::new(br"\\\conky\mountpoint\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	719 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	720 HgPath::new(br""),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	721 HgPath::new(br"\\\conky\mountpoint\foo\bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	722 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	723 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	724 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	725 HgPath::new(br"///conky/mountpoint/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	726 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	727 HgPath::new(br""),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	728 HgPath::new(br"///conky/mountpoint/foo/bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	729 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	730 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	731 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	732 HgPath::new(br"\\conky\\mountpoint\foo\bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	733 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	734 HgPath::new(br""),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	735 HgPath::new(br"\\conky\\mountpoint\foo\bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	736 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	737 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	738 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	739 HgPath::new(br"//conky//mountpoint/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	740 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	741 HgPath::new(br""),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	742 HgPath::new(br"//conky//mountpoint/foo/bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	743 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	744 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	745 // UNC part containing U+0130
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	746 assert_eq!(
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	747 HgPath::new(b"//conky/MOUNTPO\xc4\xb0NT/foo/bar").split_drive(),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	748 (
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	749 HgPath::new(b"//conky/MOUNTPO\xc4\xb0NT"),
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	750 HgPath::new(br"/foo/bar")
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	751 )
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	752 );
baa4e7fdfd47 rust-utils: add Rust implementation of Python's "os.path.splitdrive" Rapha?l Gom?s <rgomes@octobus.net> parents: 43914 diff changeset	753 }
44313 9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	754
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	755 #[test]
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	756 fn test_parent() {
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	757 let path = HgPath::new(b"");
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	758 assert_eq!(path.parent(), path);
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	759
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	760 let path = HgPath::new(b"a");
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	761 assert_eq!(path.parent(), HgPath::new(b""));
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	762
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	763 let path = HgPath::new(b"a/b");
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	764 assert_eq!(path.parent(), HgPath::new(b"a"));
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	765
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	766 let path = HgPath::new(b"a/other/b");
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	767 assert_eq!(path.parent(), HgPath::new(b"a/other"));
9ab4830e9e3d rust-hg-path: add useful methods to `HgPath` Rapha?l Gom?s <rgomes@octobus.net> parents: 44312 diff changeset	768 }
42959 3fe40dd6355d rust-hgpath: add HgPath and HgPathBuf structs to encapsulate handling of paths Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	769 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-core/src/utils/hg_path.rs @ 46503:2e2033081274