Skip to content
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.

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

Rollup of 11 pull requests #50769

Merged
merged 31 commits into from
May 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8b8091d
Rewrite docs for `std::ptr`
ecstatic-morse Apr 6, 2018
ee259e4
Change `write_bytes` test causing UB to `no_run`
ecstatic-morse Apr 7, 2018
b564c4a
Fix example for `ptr::replace`
ecstatic-morse Apr 8, 2018
6eceb94
Don't link "Undefined Behavior" heading
ecstatic-morse Apr 8, 2018
422b616
Fix broken link in `write_unaligned` docs
ecstatic-morse Apr 8, 2018
d7ce9a2
Fix broken relative links
ecstatic-morse Apr 8, 2018
d7209d5
Fix various nits from PR review
ecstatic-morse Apr 9, 2018
e350ba4
Use the "Safety" heading instead of "Undefined Behavior"
May 9, 2018
827251e
Shorten ownership safety discussion in `read_volatile`
May 9, 2018
3778356
Update the man page with additional --print options
sanxiyn May 10, 2018
4b14573
Add minification process
GuillaumeGomez May 10, 2018
e2db0a5
Update js tester tool
GuillaumeGomez May 11, 2018
3daded0
rustdoc: Add support for pub(restricted)
ollie27 May 12, 2018
8789056
Improve eager type resolution error message
leoyvens May 13, 2018
2c4b152
Add “Examples” section header in f32/f64 doc comments.
frewsxcv May 13, 2018
703eceb
Hyperlink DOI against preferred resolver
katrinleinweber May 14, 2018
120cd2c
Uncapitalize "You"
kraai May 14, 2018
2ccf71c
Migrate the toolstate update bot to rust-highfive
kennytm May 10, 2018
df2bbf7
ci: Add Dockerfile for dist-sparc64-linux
glaubitz May 12, 2018
a10577c
save-analysis: handle aliasing imports a bit more nicely
nrc May 15, 2018
7a9eb83
Rollup merge of #49767 - ecstatic-morse:ptr-docs, r=steveklabnik
GuillaumeGomez May 15, 2018
d4bd85d
Rollup merge of #50399 - nrc:alias, r=eddyb
GuillaumeGomez May 15, 2018
30c0b56
Rollup merge of #50594 - sanxiyn:man-print, r=steveklabnik
GuillaumeGomez May 15, 2018
91c648b
Rollup merge of #50613 - kennytm:update-toolstate-with-highfive, r=al…
GuillaumeGomez May 15, 2018
934e37a
Rollup merge of #50632 - GuillaumeGomez:minification, r=ollie27
GuillaumeGomez May 15, 2018
eb83606
Rollup merge of #50685 - glaubitz:sparc64-linux, r=alexcrichton
GuillaumeGomez May 15, 2018
6dc4971
Rollup merge of #50691 - ollie27:rustdoc_pub_restricted, r=QuietMisdr…
GuillaumeGomez May 15, 2018
7c7941d
Rollup merge of #50712 - leodasvacas:improve-eager-resolution-error-m…
GuillaumeGomez May 15, 2018
9c4843f
Rollup merge of #50720 - frewsxcv:frewsxcv-examples, r=QuietMisdreavus
GuillaumeGomez May 15, 2018
8902fc2
Rollup merge of #50733 - katrinleinweber:patch-secure-DOI, r=kennytm
GuillaumeGomez May 15, 2018
4066d22
Rollup merge of #50745 - kraai:patch-1, r=kennytm
GuillaumeGomez May 15, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ env:
# AWS_SECRET_ACCESS_KEY=...
- secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo="
# TOOLSTATE_REPO_ACCESS_TOKEN=...
- secure: "cFh8thThqEJLC98XKI5pfqflUzOlxsYPRW20AWRaYOOgYHPTiGWypTXiPbGSKaeAXTZoOA+DpQtEmefc0U6lt9dHc7a/MIaK6isFurjlnKYiLOeTruzyu1z7PWCeZ/jKXsU2RK/88DBtlNwfMdaMIeuKj14IVfpepPPL71ETbuk="
- secure: "ESfcXqv4N2VMhqi2iIyw6da9VrsA78I4iR1asouCaq4hzTTrkB4WNRrfURy6xg72gQ4nMhtRJbB0/2jmc9Cu1+g2CzXtyiL223aJ5CKrXdcvbitopQSDfp07dMWm+UED+hNFEanpErKAeU/6FM3A+J+60PMk8MCF1h9tqNRISJw="

before_install:
# We'll use the AWS cli to download/upload cached docker layers, so install
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ environment:
secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80
SCCACHE_DIGEST: f808afabb4a4eb1d7112bcb3fa6be03b61e93412890c88e177c667eb37f46353d7ec294e559b16f9f4b5e894f2185fe7670a0df15fd064889ecbd80f0c34166c
TOOLSTATE_REPO_ACCESS_TOKEN:
secure: PTZiSxJMVUZ0VnMR5i13E4OagbXfglj7pcskDQiKufVrDm13mLoI0vDJAEM35+bY
secure: gKGlVktr7iuqCoYSxHxDE9ltLOKU0nYDEuQxvWbNxUIW7ri5ppn8L06jQzN0GGzN

# By default schannel checks revocation of certificates unlike some other SSL
# backends, but we've historically had problems on CI where a revocation
Expand Down
64 changes: 56 additions & 8 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions src/ci/docker/disabled/dist-sparc64-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:16.04

RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
make \
file \
curl \
ca-certificates \
python2.7 \
git \
cmake \
sudo \
gdb \
xz-utils \
g++-sparc64-linux-gnu \
libssl-dev \
pkg-config


COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

ENV HOSTS=sparc64-unknown-linux-gnu

ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
2 changes: 1 addition & 1 deletion src/ci/docker/x86_64-gnu-tools/repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ commit_toolstate_change() {
OLDFLAGS="$-"
set -eu

git config --global user.email '34210020+rust-toolstate-update@users.noreply.github.com'
git config --global user.email '7378925+rust-toolstate-update@users.noreply.github.com'
git config --global user.name 'Rust Toolstate Update'
git config --global credential.helper store
printf 'https://%s:x-oauth-basic@github.com\n' "$TOOLSTATE_REPO_ACCESS_TOKEN" \
Expand Down
2 changes: 1 addition & 1 deletion src/doc/man/rustc.1
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Configure the output that \fBrustc\fR will produce. Each emission may also have
an optional explicit output \fIPATH\fR specified for that particular emission
kind. This path takes precedence over the \fB-o\fR option.
.TP
\fB\-\-print\fR [crate\-name|file\-names|sysroot]
\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]
Comma separated list of compiler information to print on stdout.
.TP
\fB\-g\fR
Expand Down
Loading