diff options
| author | bors <bors@rust-lang.org> | 2021-04-08 07:23:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-08 07:23:04 +0000 |
| commit | 69e1d22ddbc67b25141a735a22a8895a678b32ca (patch) | |
| tree | 778d8ab6318486d34ae952e0caafbe40ebc50319 | |
| parent | 1408715ab88cc51ba58bd344209f33e91bdb50d3 (diff) | |
| parent | 54dc7cebce9e983a72ee06657e931ba34b373ea8 (diff) | |
| download | rust-69e1d22ddbc67b25141a735a22a8895a678b32ca.tar.gz rust-69e1d22ddbc67b25141a735a22a8895a678b32ca.zip | |
Auto merge of #83981 - nagisa:nagisa/revert-cfg-wasm, r=Mark-Simulacrum
Remove the insta-stable `cfg(wasm)` The addition of `cfg(wasm)` was an oversight on my end that turns out to have a number of downsides: * It was introduced as an insta-stable addition, forgoing the usual staging mechanism we use for potentially far-reaching changes; * It is a breaking change for people who are using `--cfg wasm` either directly or via cargo for other purposes; * It is not entirely clear if a bare `wasm` cfg is a right option or whether `wasm` family of targets are special enough to warrant special-casing these targets specifically. As for the last point, there appears to be a fair amount of support for reducing the boilerplate in specifying architectures from the same family, while ignoring their pointer width. The suggested way forward would be to propose such a change as a separate RFC as it is potentially a quite contentious addition. cc #83879 `@devsnek`
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/clean/cfg.rs | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index ec04bf7d054..75bd8880b34 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -822,9 +822,6 @@ pub fn default_configuration(sess: &Session) -> CrateConfig { } } ret.insert((sym::target_arch, Some(Symbol::intern(arch)))); - if sess.target.is_like_wasm { - ret.insert((sym::wasm, None)); - } ret.insert((sym::target_endian, Some(Symbol::intern(end.as_str())))); ret.insert((sym::target_pointer_width, Some(Symbol::intern(&wordsz)))); ret.insert((sym::target_env, Some(Symbol::intern(env)))); diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 54fea551594..03fe5bcd297 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1295,7 +1295,6 @@ symbols! { vreg, vreg_low16, warn, - wasm, wasm_import_module, wasm_target_feature, while_let, diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs index e93803e2761..592aefb6a4b 100644 --- a/src/librustdoc/clean/cfg.rs +++ b/src/librustdoc/clean/cfg.rs @@ -487,7 +487,6 @@ impl<'a> fmt::Display for Display<'a> { "windows" => "Windows", _ => "", }, - (sym::wasm, None) => "WebAssembly", (sym::target_arch, Some(arch)) => match &*arch.as_str() { "aarch64" => "AArch64", "arm" => "ARM", |