Skip to content

Commit 27acb9b

Browse files
committedMay 15, 2018
Auto merge of #50769 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #49767 (Rewrite docs for `std::ptr`) - #50399 (save-analysis: handle aliasing imports a bit more nicely) - #50594 (Update the man page with additional --print options) - #50613 (Migrate the toolstate update bot to rust-highfive) - #50632 (Add minification process) - #50685 (ci: Add Dockerfile for dist-sparc64-linux) - #50691 (rustdoc: Add support for pub(restricted)) - #50712 (Improve eager type resolution error message) - #50720 (Add “Examples” section header in f32/f64 doc comments.) - #50733 (Hyperlink DOI against preferred resolver) - #50745 (Uncapitalize "You") Failed merges:
2 parents eca0da5 + 4066d22 commit 27acb9b

File tree

29 files changed

+980
-284
lines changed

29 files changed

+980
-284
lines changed
 

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ env:
197197
# AWS_SECRET_ACCESS_KEY=...
198198
- secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo="
199199
# TOOLSTATE_REPO_ACCESS_TOKEN=...
200-
- secure: "cFh8thThqEJLC98XKI5pfqflUzOlxsYPRW20AWRaYOOgYHPTiGWypTXiPbGSKaeAXTZoOA+DpQtEmefc0U6lt9dHc7a/MIaK6isFurjlnKYiLOeTruzyu1z7PWCeZ/jKXsU2RK/88DBtlNwfMdaMIeuKj14IVfpepPPL71ETbuk="
200+
- secure: "ESfcXqv4N2VMhqi2iIyw6da9VrsA78I4iR1asouCaq4hzTTrkB4WNRrfURy6xg72gQ4nMhtRJbB0/2jmc9Cu1+g2CzXtyiL223aJ5CKrXdcvbitopQSDfp07dMWm+UED+hNFEanpErKAeU/6FM3A+J+60PMk8MCF1h9tqNRISJw="
201201

202202
before_install:
203203
# We'll use the AWS cli to download/upload cached docker layers, so install

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80
77
SCCACHE_DIGEST: f808afabb4a4eb1d7112bcb3fa6be03b61e93412890c88e177c667eb37f46353d7ec294e559b16f9f4b5e894f2185fe7670a0df15fd064889ecbd80f0c34166c
88
TOOLSTATE_REPO_ACCESS_TOKEN:
9-
secure: PTZiSxJMVUZ0VnMR5i13E4OagbXfglj7pcskDQiKufVrDm13mLoI0vDJAEM35+bY
9+
secure: gKGlVktr7iuqCoYSxHxDE9ltLOKU0nYDEuQxvWbNxUIW7ri5ppn8L06jQzN0GGzN
1010

1111
# By default schannel checks revocation of certificates unlike some other SSL
1212
# backends, but we've historically had problems on CI where a revocation

‎src/Cargo.lock

+56-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM ubuntu:16.04
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
g++ \
5+
make \
6+
file \
7+
curl \
8+
ca-certificates \
9+
python2.7 \
10+
git \
11+
cmake \
12+
sudo \
13+
gdb \
14+
xz-utils \
15+
g++-sparc64-linux-gnu \
16+
libssl-dev \
17+
pkg-config
18+
19+
20+
COPY scripts/sccache.sh /scripts/
21+
RUN sh /scripts/sccache.sh
22+
23+
ENV HOSTS=sparc64-unknown-linux-gnu
24+
25+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
26+
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS

‎src/ci/docker/x86_64-gnu-tools/repo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ commit_toolstate_change() {
6060
OLDFLAGS="$-"
6161
set -eu
6262

63-
git config --global user.email '34210020+rust-toolstate-update@users.noreply.github.com'
63+
git config --global user.email '7378925+rust-toolstate-update@users.noreply.github.com'
6464
git config --global user.name 'Rust Toolstate Update'
6565
git config --global credential.helper store
6666
printf 'https://%s:x-oauth-basic@github.com\n' "$TOOLSTATE_REPO_ACCESS_TOKEN" \

‎src/doc/man/rustc.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Configure the output that \fBrustc\fR will produce. Each emission may also have
5555
an optional explicit output \fIPATH\fR specified for that particular emission
5656
kind. This path takes precedence over the \fB-o\fR option.
5757
.TP
58-
\fB\-\-print\fR [crate\-name|file\-names|sysroot]
58+
\fB\-\-print\fR [crate\-name|\:file\-names|\:sysroot|\:cfg|\:target\-list|\:target\-cpus|\:target\-features|\:relocation\-models|\:code\-models|\:tls\-models|\:target\-spec\-json|\:native\-static\-libs]
5959
Comma separated list of compiler information to print on stdout.
6060
.TP
6161
\fB\-g\fR

0 commit comments

Comments
 (0)
Please sign in to comment.