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

wasm-builder: Support latest nightly (#10837)

Browse Source 
* wasm-builder: Support latest nightly

With latest nightly, aka rust version 1.60+ namespaced features are added. This changes the handling
of optional dependencies. We currently have features that enable optional dependencies when `std` is
enabled. This was before no problem, but now the wasm-builder detects them as enabled. To support
the transition period until 1.60 is released as stable, this pr adds an heuristic to not enable these
optional crates in the wasm build when they are enabled in the `std` feature. This heuristic fails
when someones enables these optional dependencies from the outside as well as via the `std` feature,
however we hope that no one is doing this at the moment. When namespaced features are enabled, these
dependencies needs to be enabled using `dep:dependency-name` to solve this properly.

https://doc.rust-lang.org/cargo/reference/unstable.html#namespaced-features

* Remove accidentally added features
This commit is contained in:
Bastian Köcher
2022-02-14 21:12:48 +01:00
committed by GitHub
parent fdd49f072c
commit 47622d6912
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/utils/wasm-builder/src/wasm_project.rs
+20 -3
View File
@@ -341,13 +341,30 @@ fn project_enabled_features(
) -> Vec<String> {
let package = find_package_by_manifest_path(cargo_manifest, crate_metadata);
let std_enabled = package.features.get("std");
let mut enabled_features = package
.features
.keys()
.filter(|f| {
.iter()
.filter(|(f, v)| {
let mut feature_env = f.replace("-", "_");
feature_env.make_ascii_uppercase();
// If this is a feature that corresponds only to an optional dependency
// and this feature is enabled by the `std` feature, we assume that this
// is only done through the `std` feature. This is a bad heuristic and should
// be removed after namespaced features are landed:
// https://doc.rust-lang.org/cargo/reference/unstable.html#namespaced-features
// Then we can just express this directly in the `Cargo.toml` and do not require
// this heuristic anymore. However, for the transition phase between now and namespaced
// features already being present in nightly, we need this code to make
// runtimes compile with all the possible rustc versions.
if v.len() == 1 && v.get(0).map_or(false, |v| *v == format!("dep:{}", f)) {
if std_enabled.as_ref().map(|e| e.iter().any(|ef| ef == *f)).unwrap_or(false) {
return false
}
}
// We don't want to enable the `std`/`default` feature for the wasm build and
// we need to check if the feature is enabled by checking the env variable.
*f != "std" &&
@@ -355,7 +372,7 @@ fn project_enabled_features(
.map(|v| v == "1")
.unwrap_or_default()
})
.cloned()
.map(|d| d.0.clone())
.collect::<Vec<_>>();
enabled_features.sort();