Skip to content

Rollup of 9 pull requests #80928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jan 12, 2021
Merged

Rollup of 9 pull requests #80928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4721b65
Split a func into cold/hot parts, reducing binary size
sivadeilra Dec 14, 2020
92d3537
Add wasi-exec-model cg option for emitting wasi reactors
coolreader18 Dec 13, 2020
de90afc
Explain method-call move errors in loops
Aaron1011 Dec 23, 2020
20979aa
Change wording of note
Aaron1011 Jan 8, 2021
eef9587
fix broken link in PartialEq doc
ericseppanen Jan 10, 2021
f9b5859
resolve: Simplify built-in macro table
petrochenkov Jan 10, 2021
578da99
Merge different function exits
LingMan Jan 10, 2021
2750e36
rustdoc: Resolve `&str` as `str`
camelid Jan 10, 2021
e2d3a25
Fix small typo
camelid Jan 11, 2021
94bf59e
Use correct ABI for wasm32 by default
devsnek Dec 13, 2020
8f64cec
new target
devsnek Dec 14, 2020
5ba3be1
squash! fix wasi
devsnek Jan 11, 2021
1d83f98
Rollup merge of #79997 - coolreader18:wasm-reactor, r=alexcrichton
JohnTitor Jan 11, 2021
edcfe7b
Rollup merge of #79998 - devsnek:wasm32-bindgen-compat, r=alexcrichton
JohnTitor Jan 11, 2021
56504a0
Rollup merge of #80042 - sivadeilra:cold_bits, r=oli-obk
JohnTitor Jan 11, 2021
8e6472f
Rollup merge of #80324 - Aaron1011:loop-move-fn-self, r=oli-obk
JohnTitor Jan 11, 2021
4646eac
Rollup merge of #80864 - ericseppanen:master, r=jyn514
JohnTitor Jan 11, 2021
fd02c83
Rollup merge of #80870 - petrochenkov:bmactable, r=oli-obk
JohnTitor Jan 11, 2021
7e16025
Rollup merge of #80885 - camelid:intra-doc-str-ref, r=jyn514
JohnTitor Jan 11, 2021
f553a0f
Rollup merge of #80904 - camelid:fix-small-typo, r=jonas-schievink
JohnTitor Jan 11, 2021
4e69c5d
Rollup merge of #80923 - LingMan:exits, r=varkor
JohnTitor Jan 11, 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
Prev Previous commit
Next Next commit
squash! fix wasi
  • Loading branch information
@devsnek
devsnek committed Jan 11, 2021
commit 5ba3be1d60618fcd7fb819fdee4590ec048f190f
9 changes: 5 additions & 4 deletions compiler/rustc_target/src/abi/call/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,10 +605,11 @@ impl<'a, Ty> FnAbi<'a, Ty> {
"nvptx64" => nvptx64::compute_abi_info(self),
"hexagon" => hexagon::compute_abi_info(self),
"riscv32" | "riscv64" => riscv::compute_abi_info(cx, self),
"wasm32" if cx.target_spec().os == "bindgen" => {
wasm32_bindgen_compat::compute_abi_info(self)
}
"wasm32" | "asmjs" => wasm32::compute_abi_info(cx, self),
"wasm32" => match cx.target_spec().os.as_str() {
"emscripten" | "wasi" => wasm32::compute_abi_info(cx, self),
_ => wasm32_bindgen_compat::compute_abi_info(self),
},
"asmjs" => wasm32::compute_abi_info(cx, self),
a => return Err(format!("unrecognized arch \"{}\" in target specification", a)),
}

Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_target/src/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,6 @@ supported_targets! {
("thumbv7a-uwp-windows-msvc", thumbv7a_uwp_windows_msvc),

("asmjs-unknown-emscripten", asmjs_unknown_emscripten),
("wasm32-unknown-bindgen", wasm32_unknown_bindgen),
("wasm32-unknown-emscripten", wasm32_unknown_emscripten),
("wasm32-unknown-unknown", wasm32_unknown_unknown),
("wasm32-wasi", wasm32_wasi),
Expand Down
9 changes: 0 additions & 9 deletions compiler/rustc_target/src/spec/wasm32_unknown_bindgen.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/doc/rustc/src/platform-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ target | std | host | notes
`thumbv8m.base-none-eabi` | * | | ARMv8-M Baseline
`thumbv8m.main-none-eabi` | * | | ARMv8-M Mainline
`thumbv8m.main-none-eabihf` | * | | ARMv8-M Mainline, hardfloat
`wasm32-unknown-bindgen` | ✓ | | WebAssembly via wasm-bindgen
`wasm32-unknown-emscripten` | ✓ | | WebAssembly via Emscripten
`wasm32-unknown-unknown` | ✓ | | WebAssembly
`wasm32-wasi` | ✓ | | WebAssembly with WASI
Expand Down