Skip to content

Commit 40ae49a

Browse files
borsbors
committed
Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton
Rollup of 11 pull requests - Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809 - Failed merges: #40771
2 parents 49c67bd + 9dc591c commit 40ae49a

File tree

111 files changed

+844
-1710
lines changed

Some content is hidden

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

111 files changed

+844
-1710
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ matrix:
5252
os: osx
5353
osx_image: xcode8.2
5454
install: &osx_install_sccache >
55-
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-apple-darwin &&
55+
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-apple-darwin &&
5656
chmod +x /usr/local/bin/sccache &&
5757
travis_retry curl -o /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
5858
chmod +x /usr/local/bin/stamp

‎appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ install:
115115
- set PATH=C:\Python27;%PATH%
116116

117117
# Download and install sccache
118-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-pc-windows-msvc
119-
- mv 2017-03-22-sccache-x86_64-pc-windows-msvc sccache.exe
118+
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-pc-windows-msvc
119+
- mv 2017-03-24-sccache-x86_64-pc-windows-msvc sccache.exe
120120
- set PATH=%PATH%;%CD%
121121

122122
# Download and install ninja

‎cargo

‎src/Cargo.lock

+21-32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/bootstrap.py

+5-12
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,8 @@ class RustBuild(object):
160160
def download_stage0(self):
161161
cache_dst = os.path.join(self.build_dir, "cache")
162162
rustc_cache = os.path.join(cache_dst, self.stage0_rustc_date())
163-
cargo_cache = os.path.join(cache_dst, self.stage0_cargo_rev())
164163
if not os.path.exists(rustc_cache):
165164
os.makedirs(rustc_cache)
166-
if not os.path.exists(cargo_cache):
167-
os.makedirs(cargo_cache)
168165

169166
if self.rustc().startswith(self.bin_root()) and \
170167
(not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
@@ -195,15 +192,15 @@ def download_stage0(self):
195192
if self.cargo().startswith(self.bin_root()) and \
196193
(not os.path.exists(self.cargo()) or self.cargo_out_of_date()):
197194
self.print_what_it_means_to_bootstrap()
198-
filename = "cargo-nightly-{}.tar.gz".format(self.build)
199-
url = "https://s3.amazonaws.com/rust-lang-ci/cargo-builds/" + self.stage0_cargo_rev()
200-
tarball = os.path.join(cargo_cache, filename)
195+
filename = "cargo-{}-{}.tar.gz".format(channel, self.build)
196+
url = "https://static.rust-lang.org/dist/" + self.stage0_rustc_date()
197+
tarball = os.path.join(rustc_cache, filename)
201198
if not os.path.exists(tarball):
202199
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
203200
unpack(tarball, self.bin_root(), match="cargo", verbose=self.verbose)
204201
self.fix_executable(self.bin_root() + "/bin/cargo")
205202
with open(self.cargo_stamp(), 'w') as f:
206-
f.write(self.stage0_cargo_rev())
203+
f.write(self.stage0_rustc_date())
207204

208205
def fix_executable(self, fname):
209206
# If we're on NixOS we need to change the path to the dynamic loader
@@ -258,9 +255,6 @@ def fix_executable(self, fname):
258255
print("warning: failed to call patchelf: %s" % e)
259256
return
260257

261-
def stage0_cargo_rev(self):
262-
return self._cargo_rev
263-
264258
def stage0_rustc_date(self):
265259
return self._rustc_date
266260

@@ -283,7 +277,7 @@ def cargo_out_of_date(self):
283277
if not os.path.exists(self.cargo_stamp()) or self.clean:
284278
return True
285279
with open(self.cargo_stamp(), 'r') as f:
286-
return self.stage0_cargo_rev() != f.read()
280+
return self.stage0_rustc_date() != f.read()
287281

288282
def bin_root(self):
289283
return os.path.join(self.build_dir, self.build, "stage0")
@@ -578,7 +572,6 @@ def bootstrap():
578572

579573
data = stage0_data(rb.rust_root)
580574
rb._rustc_channel, rb._rustc_date = data['rustc'].split('-', 1)
581-
rb._cargo_rev = data['cargo']
582575

583576
# Fetch/build the bootstrap
584577
rb.build = rb.build_triple()

‎src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use build_helper::output;
2323
use Build;
2424

2525
// The version number
26-
pub const CFG_RELEASE_NUM: &'static str = "1.17.0";
26+
pub const CFG_RELEASE_NUM: &'static str = "1.18.0";
2727

2828
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
2929
// Be sure to make this starts with a dot to conform to semver pre-release

‎src/ci/docker/armhf-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
7474
RUN curl -O http://ftp.nl.debian.org/debian/dists/jessie/main/installer-armhf/current/images/device-tree/vexpress-v2p-ca15-tc1.dtb
7575

7676
RUN curl -o /usr/local/bin/sccache \
77-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
77+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
7878
chmod +x /usr/local/bin/sccache
7979

8080
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/cross/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2222
pkg-config
2323

2424
RUN curl -o /usr/local/bin/sccache \
25-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
25+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
2626
chmod +x /usr/local/bin/sccache
2727

2828
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/dist-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
3232
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3333

3434
RUN curl -o /usr/local/bin/sccache \
35-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
35+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
3636
chmod +x /usr/local/bin/sccache
3737

3838
ENV TARGETS=arm-linux-androideabi

‎src/ci/docker/dist-arm-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN ./build-toolchains.sh
6262
USER root
6363

6464
RUN curl -o /usr/local/bin/sccache \
65-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
65+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
6666
chmod +x /usr/local/bin/sccache
6767

6868
ENV PATH=$PATH:/x-tools/arm-unknown-linux-gnueabi/bin

‎src/ci/docker/dist-armv7-aarch64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN ./build-toolchains.sh
6363
USER root
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV PATH=$PATH:/x-tools/aarch64-unknown-linux-gnueabi/bin

‎src/ci/docker/dist-freebsd/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2626
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2727

2828
RUN curl -o /usr/local/bin/sccache \
29-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
29+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
3030
chmod +x /usr/local/bin/sccache
3131

3232
ENV \

‎src/ci/docker/dist-fuchsia/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2929
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
3030

3131
RUN curl -o /usr/local/bin/sccache \
32-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
32+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
3333
chmod +x /usr/local/bin/sccache
3434

3535
ENV \

‎src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-ini
2626
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
2727

2828
RUN curl -o /usr/local/bin/sccache \
29-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
29+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
3030
chmod +x /usr/local/bin/sccache
3131

3232
ENV RUST_CONFIGURE_ARGS \

‎src/ci/docker/dist-mips-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1818
pkg-config
1919

2020
RUN curl -o /usr/local/bin/sccache \
21-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
21+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
2222
chmod +x /usr/local/bin/sccache
2323

2424
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/dist-mips64-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1818
pkg-config
1919

2020
RUN curl -o /usr/local/bin/sccache \
21-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
21+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
2222
chmod +x /usr/local/bin/sccache
2323

2424
RUN curl -OL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb && \

‎src/ci/docker/dist-powerpc-linux/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN ./build-powerpc-toolchain.sh
6363
USER root
6464

6565
RUN curl -o /usr/local/bin/sccache \
66-
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-unknown-linux-musl && \
66+
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-unknown-linux-musl && \
6767
chmod +x /usr/local/bin/sccache
6868

6969
ENV PATH=$PATH:/x-tools/powerpc-unknown-linux-gnu/bin

0 commit comments

Comments
 (0)