Skip to content

Commit aa69777

Browse files
committedOct 29, 2019
Auto merge of #65943 - tmandry:rollup-g20uvkh, r=tmandry
Rollup of 12 pull requests Successful merges: - #65405 (Create new error E0742 and add long error explanation) - #65539 (resolve: Turn the "non-empty glob must import something" error into a lint) - #65724 (ci: refactor pr tools job skipping) - #65741 (Prevent help popup to disappear when clicking on it) - #65832 (Re-enable Emscripten's exception handling support) - #65843 (Enable dist for MIPS64 musl targets) - #65898 (add basic HermitCore support within libtest) - #65900 (proc_macro: clean up bridge::client::__run_expand{1,2} a bit.) - #65906 (Update mdbook to 0.3.3) - #65920 (Use rustc-workspace-hack for rustbook) - #65930 (doc: use new feature gate for c_void type) - #65936 (save-analysis: Account for async desugaring in async fn return types) Failed merges: - #65434 (Add long error explanation for E0577) r? @ghost
2 parents caa1f8d + db49686 commit aa69777

File tree

80 files changed

+304
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+304
-202
lines changed
 

‎Cargo.lock

+13-12
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ dependencies = [
2727

2828
[[package]]
2929
name = "ammonia"
30-
version = "2.1.2"
30+
version = "3.0.0"
3131
source = "registry+https://github.com/rust-lang/crates.io-index"
32-
checksum = "384d704f242a0a9faf793fff775a0be6ab9aa27edabffa097331d73779142520"
32+
checksum = "9e266e1f4be5ffa05309f650e2586fe1d3ae6034eb24025a7ae1dfecc330823a"
3333
dependencies = [
3434
"html5ever",
3535
"lazy_static 1.3.0",
3636
"maplit",
3737
"matches",
3838
"tendril",
39-
"url 1.7.2",
39+
"url 2.1.0",
4040
]
4141

4242
[[package]]
@@ -1363,16 +1363,16 @@ dependencies = [
13631363

13641364
[[package]]
13651365
name = "html5ever"
1366-
version = "0.23.0"
1366+
version = "0.24.1"
13671367
source = "registry+https://github.com/rust-lang/crates.io-index"
1368-
checksum = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7"
1368+
checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb"
13691369
dependencies = [
13701370
"log",
13711371
"mac",
13721372
"markup5ever",
1373-
"proc-macro2 0.4.30",
1374-
"quote 0.6.12",
1375-
"syn 0.15.35",
1373+
"proc-macro2 1.0.3",
1374+
"quote 1.0.2",
1375+
"syn 1.0.5",
13761376
]
13771377

13781378
[[package]]
@@ -1902,9 +1902,9 @@ checksum = "08cbb6b4fef96b6d77bfc40ec491b1690c779e77b05cd9f07f787ed376fd4c43"
19021902

19031903
[[package]]
19041904
name = "markup5ever"
1905-
version = "0.8.1"
1905+
version = "0.9.0"
19061906
source = "registry+https://github.com/rust-lang/crates.io-index"
1907-
checksum = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21"
1907+
checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03"
19081908
dependencies = [
19091909
"log",
19101910
"phf",
@@ -1925,9 +1925,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
19251925

19261926
[[package]]
19271927
name = "mdbook"
1928-
version = "0.3.1"
1928+
version = "0.3.3"
19291929
source = "registry+https://github.com/rust-lang/crates.io-index"
1930-
checksum = "949bb2acb2cff9fa5c375cf9c43e70b3dba0a974d9fe01c31285d7a84d2a0fa2"
1930+
checksum = "9a070268274c566082efb6b2ace7743e43ba91a70d5c6982981e96d3c05ac81c"
19311931
dependencies = [
19321932
"ammonia",
19331933
"chrono",
@@ -3103,6 +3103,7 @@ dependencies = [
31033103
"failure",
31043104
"mdbook",
31053105
"mdbook-linkcheck",
3106+
"rustc-workspace-hack",
31063107
]
31073108

31083109
[[package]]

‎src/bootstrap/configure.py

+4
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ def v(*args):
133133
"mips-unknown-linux-musl install directory")
134134
v("musl-root-mipsel", "target.mipsel-unknown-linux-musl.musl-root",
135135
"mipsel-unknown-linux-musl install directory")
136+
v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
137+
"mips64-unknown-linux-muslabi64 install directory")
138+
v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
139+
"mips64el-unknown-linux-muslabi64 install directory")
136140
v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
137141
"rootfs in qemu testing, you probably don't want to use this")
138142
v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",

0 commit comments

Comments
 (0)