Skip to content

Commit 2837b99

Browse files
committedFeb 13, 2019
Auto merge of #58413 - Centril:rollup, r=Centril
Rollup of 13 pull requests Successful merges: - #57693 (Doc rewording) - #57815 (Speed up the fast path for assert_eq! and assert_ne!) - #58034 (Stabilize the time_checked_add feature) - #58057 (Stabilize linker-plugin based LTO (aka cross-language LTO)) - #58137 (Cleanup: rename node_id_to_type(_opt)) - #58166 (allow shorthand syntax for deprecation reason) - #58196 (Add specific feature gate error for const-unstable features) - #58200 (fix str mutating through a ptr derived from &self) - #58273 (Rename rustc_errors dependency in rust 2018 crates) - #58289 (impl iter() for dyn Error) - #58387 (Disallow `auto` trait alias syntax) - #58404 (use Ubuntu keyserver for CloudABI ports) - #58405 (Remove some dead code from libcore) Failed merges: r? @ghost
2 parents 0f949c2 + 3883319 commit 2837b99

File tree

131 files changed

+931
-416
lines changed

Some content is hidden

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

131 files changed

+931
-416
lines changed
 

‎src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ ln -s ../lib/llvm-5.0/bin/lld /usr/bin/${target}-ld
3232
ln -s ../../${target} /usr/lib/llvm-5.0/${target}
3333

3434
# Install the C++ runtime libraries from CloudABI Ports.
35-
echo deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi > \
36-
/etc/apt/sources.list.d/cloudabi.list
37-
curl 'https://pgp.mit.edu/pks/lookup?op=get&search=0x0DA51B8531344B15' | \
38-
apt-key add -
35+
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15
36+
add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi'
37+
3938
apt-get update
40-
apt-get install -y $(echo ${target} | sed -e s/_/-/g)-cxx-runtime
39+
apt-get install -y "${target//_/-}-cxx-runtime"

‎src/doc/rustc/src/SUMMARY.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
- [Targets](targets/index.md)
1414
- [Built-in Targets](targets/built-in.md)
1515
- [Custom Targets](targets/custom.md)
16-
- [Contributing to `rustc`](contributing.md)
16+
- [Linker-plugin based LTO](linker-plugin-lto.md)
17+
- [Contributing to `rustc`](contributing.md)

0 commit comments

Comments
 (0)