Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow mutation for Canonical Paths and PathBufs

Browse Source
This commit is contained in:
Ian Manske 2024-06-01 15:25:58 -04:00
parent dd569b1237
commit dfe3070b18
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-path/src/form.rs
View File

@ -20,7 +20,7 @@ pub trait PathJoin: PathForm {
pub trait PathPush: PathForm {} pub trait PathPush: PathForm {}
pub trait PathSet: PathForm {} pub trait PathMut: PathForm {}
/// A path whose form is unknown. It could be a relative, absolute, or canonical path. /// A path whose form is unknown. It could be a relative, absolute, or canonical path.
/// ///
@ -36,7 +36,7 @@ impl PathJoin for Any {
type Output = Self; type Output = Self;
} }
impl PathPush for Any {} impl PathPush for Any {}
impl PathSet for Any {} impl PathMut for Any {}
/// A strictly relative path. /// A strictly relative path.
/// ///
@ -51,7 +51,7 @@ impl MaybeRelative for Relative {}
impl PathJoin for Relative { impl PathJoin for Relative {
type Output = Any; type Output = Any;
} }
impl PathSet for Relative {} impl PathMut for Relative {}
/// An absolute path. /// An absolute path.
/// ///
@ -68,7 +68,7 @@ impl PathJoin for Absolute {
type Output = Self; type Output = Self;
} }
impl PathPush for Absolute {} impl PathPush for Absolute {}
impl PathSet for Absolute {} impl PathMut for Absolute {}
// A canonical path. // A canonical path.
// //

28
crates/nu-path/src/path.rs
View File

@ -1,6 +1,6 @@
use crate::form::{ use crate::form::{
Absolute, Any, Canonical, IsAbsolute, MaybeAbsolute, MaybeRelative, PathCast, PathForm, Absolute, Any, Canonical, IsAbsolute, MaybeAbsolute, MaybeRelative, PathCast, PathForm,
PathJoin, PathPush, PathSet, Relative, PathJoin, PathMut, PathPush, Relative,
}; };
use std::{ use std::{
borrow::{Borrow, Cow}, borrow::{Borrow, Cow},
@ -45,11 +45,6 @@ impl<Form: PathForm> Path<Form> {
self.inner.as_os_str() self.inner.as_os_str()
} }
#[inline]
pub fn as_mut_os_str(&mut self) -> &mut OsStr {
self.inner.as_mut_os_str()
}
#[inline] #[inline]
pub fn to_str(&self) -> Option<&str> { pub fn to_str(&self) -> Option<&str> {
self.inner.to_str() self.inner.to_str()
@ -186,7 +181,12 @@ impl<Form: PathJoin> Path<Form> {
} }
} }
impl<Form: PathSet> Path<Form> { impl<Form: PathMut> Path<Form> {
#[inline]
pub fn as_mut_os_str(&mut self) -> &mut OsStr {
self.inner.as_mut_os_str()
}
#[inline] #[inline]
pub fn with_file_name(&self, file_name: impl AsRef<OsStr>) -> PathBuf<Form> { pub fn with_file_name(&self, file_name: impl AsRef<OsStr>) -> PathBuf<Form> {
PathBuf::new_unchecked(self.inner.with_file_name(file_name)) PathBuf::new_unchecked(self.inner.with_file_name(file_name))
@ -366,11 +366,6 @@ impl<Form: PathForm> PathBuf<Form> {
self.inner.pop() self.inner.pop()
} }
#[inline]
pub fn as_mut_os_string(&mut self) -> &mut OsString {
self.inner.as_mut_os_string()
}
#[inline] #[inline]
pub fn into_os_string(self) -> OsString { pub fn into_os_string(self) -> OsString {
self.inner.into_os_string() self.inner.into_os_string()
@ -473,7 +468,12 @@ impl<Form: PathPush> PathBuf<Form> {
} }
} }
impl<Form: PathSet> PathBuf<Form> { impl<Form: PathMut> PathBuf<Form> {
#[inline]
pub fn as_mut_os_string(&mut self) -> &mut OsString {
self.inner.as_mut_os_string()
}
#[inline] #[inline]
pub fn set_file_name(&mut self, file_name: impl AsRef<OsStr>) { pub fn set_file_name(&mut self, file_name: impl AsRef<OsStr>) {
self.inner.set_file_name(file_name) self.inner.set_file_name(file_name)
@ -538,7 +538,7 @@ impl<Form: PathForm> Deref for PathBuf<Form> {
} }
} }
impl<Form: PathForm> DerefMut for PathBuf<Form> { impl<Form: PathMut> DerefMut for PathBuf<Form> {
#[inline] #[inline]
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
// Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`. // Safety: `Path<Form>` is a repr(transparent) wrapper around `std::path::Path`.