Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

fix(solc): use path slash for remapping display on windows #1454

Merged
merged 1 commit into from
Jul 5, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions ethers-solc/src/remappings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use serde::{Deserialize, Serialize};
use std::{
collections::{hash_map::Entry, HashMap},
fmt,
fmt::Write,
path::{Path, PathBuf},
str::FromStr,
};
Expand Down Expand Up @@ -110,11 +109,23 @@ impl<'de> Deserialize<'de> for Remapping {
// Remappings are printed as `prefix=target`
impl fmt::Display for Remapping {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}={}", self.name, self.path)?;
if !self.path.ends_with('/') {
f.write_char('/')?;
let mut s = {
#[cfg(target_os = "windows")]
{
// ensure we have `/` slashes on windows
use path_slash::PathExt;
format!("{}={}", self.name, std::path::Path::new(&self.path).to_slash_lossy())
}
#[cfg(not(target_os = "windows"))]
{
format!("{}={}", self.name, self.path)
}
};

if !s.ends_with('/') {
s.push('/');
}
Ok(())
f.write_str(&s)
}
}

Expand Down Expand Up @@ -251,7 +262,19 @@ impl RelativeRemapping {
// Remappings are printed as `prefix=target`
impl fmt::Display for RelativeRemapping {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut s = format!("{}={}", self.name, self.path.original().display());
let mut s = {
#[cfg(target_os = "windows")]
{
// ensure we have `/` slashes on windows
use path_slash::PathExt;
format!("{}={}", self.name, self.path.original().to_slash_lossy())
}
#[cfg(not(target_os = "windows"))]
{
format!("{}={}", self.name, self.path.original().display())
}
};

if !s.ends_with('/') {
s.push('/');
}
Expand Down