zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-24 18:39:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Bad path handling on unix platforms.

Browse Source
This commit is contained in:
Jeremy Wall 2020-06-04 15:48:34 -05:00 committed by Jeremy Wall
parent 6ddc830210
commit cac733eaea
1 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ast/rewrite.rs
View File

@ -32,23 +32,8 @@ impl Visitor for Rewriter {
let main_separator = format!("{}", std::path::MAIN_SEPARATOR); let main_separator = format!("{}", std::path::MAIN_SEPARATOR);
if let Expression::Include(ref mut def) = expr { if let Expression::Include(ref mut def) = expr {
let path = PathBuf::from(&def.path.fragment); let path = PathBuf::from(&def.path.fragment);
#[cfg(not(windows))] if path.is_relative() {
{ def.path.fragment = self.base.join(path).to_string_lossy().to_string();
if path.is_relative() {
def.path.fragment = self
.base
.join(path)
.canonicalize()
.unwrap()
.to_string_lossy()
.to_string();
}
}
#[cfg(windows)]
{
if path.is_relative() {
def.path.fragment = self.base.join(path).to_string_lossy().to_string();
}
} }
} }
if let Expression::Import(ref mut def) = expr { if let Expression::Import(ref mut def) = expr {
@ -62,23 +47,8 @@ impl Visitor for Rewriter {
if path.starts_with(format!("std{}", main_separator)) { if path.starts_with(format!("std{}", main_separator)) {
return; return;
} }
#[cfg(not(windows))] if path.is_relative() {
{ def.path.fragment = self.base.join(path).to_string_lossy().to_string();
if path.is_relative() {
def.path.fragment = self
.base
.join(path)
.canonicalize()
.unwrap()
.to_string_lossy()
.to_string();
}
}
#[cfg(windows)]
{
if path.is_relative() {
def.path.fragment = self.base.join(path).to_string_lossy().to_string();
}
} }
} }
} }