zenithsiz/zbuild
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zbuild.git synced 2026-02-04 22:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

dir_name no longer appends / to the alias.

Browse Source
This commit is contained in:
Filipe Rodrigues 2022-08-29 01:52:10 +01:00
parent e4fe3071a7
commit 72f17d52d3
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/build/expand_expr.rs
View File

@ -111,7 +111,6 @@ pub fn expand_expr_string(expr: &Expr, visitor: &mut impl Visitor) -> Result<Str
/// Expands an alias operation on the value of that alias
fn expand_alias_op(op: AliasOp, value: String) -> Result<String, anyhow::Error> {
let value = match op {
// TODO: Not add `/` here.
AliasOp::DirName => {
// Get the path and try to pop the last segment
let mut path = PathBuf::from(value);
@ -120,12 +119,9 @@ fn expand_alias_op(op: AliasOp, value: String) -> Result<String, anyhow::Error>
// Then convert it back to a string
// Note: This should technically never fail, since the path was originally
// utf-8
let mut path = path
.into_os_string()
path.into_os_string()
.into_string()
.expect("utf-8 path was no longer utf-8 after getting dir-name");
path.push('/');
path
.expect("utf-8 path was no longer utf-8 after getting dir-name")
},
};