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

Commit

Permalink
fix(solc): use path slash for remapping display on windows (#1454)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsse authored Jul 5, 2022
1 parent 2d8020e commit cf1046e
Showing 1 changed file with 29 additions and 6 deletions.
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

0 comments on commit cf1046e

Please sign in to comment.