diff options
| author | bors <bors@rust-lang.org> | 2020-08-16 22:00:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-16 22:00:29 +0000 |
| commit | 7e6d6e5f535321c2223f044caba16f97b825009c (patch) | |
| tree | 2543a4394a25a4fe49011ab4f6fefb32bff84449 /src/ci/docker/scripts | |
| parent | 9b4db695b0ab13885a61deb1b2e4d6599b8c5bbc (diff) | |
| parent | e46b1efd39849196471c18a5b66d60bfc8ca20a0 (diff) | |
| download | rust-7e6d6e5f535321c2223f044caba16f97b825009c.tar.gz rust-7e6d6e5f535321c2223f044caba16f97b825009c.zip | |
Auto merge of #75609 - tmandry:rollup-yrcmgke, r=tmandry
Rollup of 10 pull requests
Successful merges:
- #74204 (Don't visit foreign function bodies when lowering ast to hir)
- #74314 (rustc_typeck: construct {Closure,Generator}Substs more directly.)
- #74346 (Use LocalDefId instead of HirId for reachable_set elements.)
- #74399 (Move DelaySpanBugEmitted to ty::context)
- #75177 (Add regression test for issue-66768)
- #75223 (Add #[track_caller] to `Session::delay_span_bug`)
- #75423 (Move to intra-doc links for /library/core/src/hint.rs)
- #75485 (pin docs: add some forward references)
- #75569 (Bump minor version of emsdk to 1.38.47)
- #75596 (Switch to intra-doc links in /sys/windows/ext/{ffi,fs,process}.rs)
Failed merges:
r? @ghost
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/emscripten.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/scripts/emscripten.sh b/src/ci/docker/scripts/emscripten.sh index 1be80741594..9f6a7f2e5db 100644 --- a/src/ci/docker/scripts/emscripten.sh +++ b/src/ci/docker/scripts/emscripten.sh @@ -19,5 +19,5 @@ exit 1 git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable cd /emsdk-portable -hide_output ./emsdk install 1.38.46-upstream -./emsdk activate 1.38.46-upstream +hide_output ./emsdk install 1.38.47-upstream +./emsdk activate 1.38.47-upstream |