Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Make wasm-builder remove invalid members #4510

Merged
bkchr merged 3 commits into from
Dec 29, 2019
Merged

Make wasm-builder remove invalid members #4510

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1071757
Make wasm-builder remove invalid members
bkchr Dec 28, 2019
4e28a92
Merge remote-tracking branch 'origin/master' into bkchr-wasm-builder-…
bkchr Dec 28, 2019
97339fd
Fixes build
bkchr Dec 28, 2019
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
Prev Previous commit
Fixes build
  • Loading branch information
@bkchr
bkchr committed Dec 28, 2019
commit 97339fd3a816536b96f708042e392f6aba4acb2d
4 changes: 2 additions & 2 deletions utils/wasm-builder/src/wasm_project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ fn find_and_clear_workspace_members(wasm_workspace: &Path) -> Vec<String> {
.and_then(|s| toml::from_str::<Table>(&s).ok())
.and_then(|mut t| t.remove("dependencies"))
.and_then(|p| p.try_into::<Table>().ok())
.and_then(|mut t| t.remove("wasm-project"))
.and_then(|mut t| t.remove("wasm_project"))
.and_then(|p| p.try_into::<Table>().ok())
{
if let Some(path) = wasm_project.remove("path")
Expand Down Expand Up @@ -322,7 +322,7 @@ fn create_project(cargo_manifest: &Path, wasm_workspace: &Path) -> PathBuf {
crate-type = ["cdylib"]

[dependencies]
wasm-project = {{ package = "{crate_name}", path = "{crate_path}", default-features = false }}
wasm_project = {{ package = "{crate_name}", path = "{crate_path}", default-features = false }}
"#,
crate_name = crate_name,
crate_path = crate_path.display(),
Expand Down