extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-08 06:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cargo fmt

Browse Source
This commit is contained in:
Zhenping Zhao 2024-11-23 18:39:31 -08:00
parent 4e51c69bfe
commit a81adc5685
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/nu-path/src/pwd_per_drive.rs
View File

@ -36,8 +36,8 @@ pub enum PathError {
/// assert_eq!(expanded, Some(PathBuf::from(r"D:\test"))); /// assert_eq!(expanded, Some(PathBuf::from(r"D:\test")));
/// ``` /// ```
pub mod singleton { pub mod singleton {
use crate::pwd_per_drive::PathError::CantLockSharedMap;
use super::*; use super::*;
use crate::pwd_per_drive::PathError::CantLockSharedMap;
/// set_pwd_per_drive /// set_pwd_per_drive
/// Record PWD for drive, path must be absolute path /// Record PWD for drive, path must be absolute path
@ -69,8 +69,7 @@ fn need_expand_pwd_per_drive(_path: &Path) -> bool {
if let Some(path_str) = _path.to_str() { if let Some(path_str) = _path.to_str() {
let chars: Vec<char> = path_str.chars().collect(); let chars: Vec<char> = path_str.chars().collect();
if chars.len() >= 2 { if chars.len() >= 2 {
return chars[1] == ':' return chars[1] == ':' && (chars.len() == 2 || (chars[2] != '/' && chars[2] != '\\'));
&& (chars.len() == 2 || (chars[2] != '/' && chars[2] != '\\'));
} }
} }
false false
@ -132,9 +131,10 @@ impl DriveToPwdMap {
match c.next() { match c.next() {
None => Err(PathError::InvalidDriveLetter), None => Err(PathError::InvalidDriveLetter),
Some(_) => { Some(_) => {
self.map[drive_letter as usize - 'A' as usize] = Some(drive_letter.to_string() + c.as_str()); self.map[drive_letter as usize - 'A' as usize] =
Some(drive_letter.to_string() + c.as_str());
Ok(()) Ok(())
}, }
} }
} else { } else {
Err(PathError::InvalidDriveLetter) Err(PathError::InvalidDriveLetter)
@ -300,15 +300,9 @@ mod tests {
assert!(drive_map.set_pwd(Path::new(r"C:\Users")).is_ok()); assert!(drive_map.set_pwd(Path::new(r"C:\Users")).is_ok());
// Or for drive 'c' // Or for drive 'c'
assert!(drive_map.set_pwd(Path::new(r"c:\Users\Example")).is_ok()); assert!(drive_map.set_pwd(Path::new(r"c:\Users\Example")).is_ok());
assert_eq!( assert_eq!(drive_map.get_pwd('C'), Ok(r"C:\Users\Example".to_string()));
drive_map.get_pwd('C'),
Ok(r"C:\Users\Example".to_string())
);
// or 'c' // or 'c'
assert_eq!( assert_eq!(drive_map.get_pwd('c'), Ok(r"C:\Users\Example".to_string()));
drive_map.get_pwd('c'),
Ok(r"C:\Users\Example".to_string())
);
// Set PWD for drive D // Set PWD for drive D
assert!(drive_map.set_pwd(Path::new(r"D:\Projects")).is_ok()); assert!(drive_map.set_pwd(Path::new(r"D:\Projects")).is_ok());