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

Upgrade wasm builder #10226

Merged
merged 8 commits into from
Nov 10, 2021
Merged

Upgrade wasm builder #10226

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d98e9d
add TypeInfo for DispatchTime
zjb0807 Oct 9, 2021
bc3a7e0
Merge branch 'paritytech:master' into master
zjb0807 Oct 10, 2021
ebcb67a
Merge branch 'paritytech:master' into master
zjb0807 Oct 12, 2021
529aed0
Merge branch 'paritytech:master' into master
zjb0807 Oct 13, 2021
dfd21f0
Merge branch 'paritytech:master' into master
zjb0807 Nov 10, 2021
c7ab72d
upgrade wasm-builder to Rust 2021
zjb0807 Nov 10, 2021
4ad3efd
remove resolver
zjb0807 Nov 10, 2021
e233cc7
revert resolver in virtual workspace
zjb0807 Nov 10, 2021
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
2 changes: 1 addition & 1 deletion utils/wasm-builder/src/prerequisites.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fn create_check_toolchain_project(project_dir: &Path) {
[package]
name = "wasm-test"
version = "1.0.0"
edition = "2018"
edition = "2021"
build = "build.rs"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion utils/wasm-builder/src/wasm_project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ fn create_project_cargo_toml(
let mut package = Table::new();
package.insert("name".into(), format!("{}-wasm", crate_name).into());
package.insert("version".into(), "1.0.0".into());
package.insert("edition".into(), "2018".into());
package.insert("edition".into(), "2021".into());
package.insert("resolver".into(), "2".into());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove this. resolver 2 is the default with 2021 edition


wasm_workspace_toml.insert("package".into(), package.into());
Expand Down