pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 13:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix escaping of the wasm file path (#6018)

Browse Source 
* Fix escaping of the wasm file path

* Add separate methods for escaped paths
This commit is contained in:
Demi Obenour
2020-05-13 22:55:24 +00:00
committed by GitHub
parent fa4d3f2f0a
commit d34a0f4e22
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/utils/wasm-builder/src/lib.rs
+2 -2
View File
@@ -166,8 +166,8 @@ pub fn build_project_with_default_rustflags(
pub const WASM_BINARY: &[u8] = include_bytes!("{wasm_binary}");
pub const WASM_BINARY_BLOATY: &[u8] = include_bytes!("{wasm_binary_bloaty}");
"#,
wasm_binary = wasm_binary.wasm_binary_path(),
wasm_binary_bloaty = bloaty.wasm_binary_bloaty_path(),
wasm_binary = wasm_binary.wasm_binary_path_escaped(),
wasm_binary_bloaty = bloaty.wasm_binary_bloaty_path_escaped(),
),
);
}
substrate/utils/wasm-builder/src/wasm_project.rs
+10 -5
View File
@@ -37,9 +37,9 @@ use itertools::Itertools;
pub struct WasmBinaryBloaty(PathBuf);
impl WasmBinaryBloaty {
/// Returns the path to the bloaty wasm binary.
pub fn wasm_binary_bloaty_path(&self) -> String {
self.0.display().to_string().replace('\\', "/")
/// Returns the escaped path to the bloaty wasm binary.
pub fn wasm_binary_bloaty_path_escaped(&self) -> String {
self.0.display().to_string().escape_default().to_string()
}
}
@@ -48,8 +48,13 @@ pub struct WasmBinary(PathBuf);
impl WasmBinary {
/// Returns the path to the wasm binary.
pub fn wasm_binary_path(&self) -> String {
self.0.display().to_string().replace('\\', "/")
pub fn wasm_binary_path(&self) -> &Path {
&self.0
}
/// Returns the escaped path to the wasm binary.
pub fn wasm_binary_path_escaped(&self) -> String {
self.0.display().to_string().escape_default().to_string()
}
}