Skip to content

Commit 164619a

Browse files
borsbors
committed
Auto merge of #38499 - alexcrichton:rollup, r=alexcrichton
Rollup of 29 pull requests - Successful merges: #37761, #38006, #38131, #38150, #38158, #38171, #38208, #38215, #38236, #38245, #38289, #38302, #38315, #38346, #38388, #38395, #38398, #38418, #38432, #38451, #38463, #38468, #38470, #38471, #38472, #38478, #38486, #38493, #38498 - Failed merges: #38271, #38483
2 parents 3038f30 + d5f1c6e commit 164619a

File tree

135 files changed

+2615
-1526
lines changed

Some content is hidden

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

135 files changed

+2615
-1526
lines changed

Diff for: ‎mk/main.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=1.15.0
16+
CFG_RELEASE_NUM=1.16.0
1717

1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release

Diff for: ‎src/Cargo.lock

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

Diff for: ‎src/bootstrap/bin/rustc.rs

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
//! switching compilers for the bootstrap and for build scripts will probably
2626
//! never get replaced.
2727
28+
#![deny(warnings)]
29+
2830
extern crate bootstrap;
2931

3032
use std::env;

Diff for: ‎src/bootstrap/bin/rustdoc.rs

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
//!
1313
//! See comments in `src/bootstrap/rustc.rs` for more information.
1414
15+
#![deny(warnings)]
16+
1517
extern crate bootstrap;
1618

1719
use std::env;

Diff for: ‎src/bootstrap/bootstrap.py

+9-13
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def verify(path, sha_path, verbose):
8181
with open(path, "rb") as f:
8282
found = hashlib.sha256(f.read()).hexdigest()
8383
with open(sha_path, "r") as f:
84-
expected, _ = f.readline().split()
84+
expected = f.readline().split()[0]
8585
verified = found == expected
8686
if not verified:
8787
print("invalid checksum:\n"
@@ -146,7 +146,7 @@ class RustBuild(object):
146146
def download_stage0(self):
147147
cache_dst = os.path.join(self.build_dir, "cache")
148148
rustc_cache = os.path.join(cache_dst, self.stage0_rustc_date())
149-
cargo_cache = os.path.join(cache_dst, self.stage0_cargo_date())
149+
cargo_cache = os.path.join(cache_dst, self.stage0_cargo_rev())
150150
if not os.path.exists(rustc_cache):
151151
os.makedirs(rustc_cache)
152152
if not os.path.exists(cargo_cache):
@@ -179,21 +179,17 @@ def download_stage0(self):
179179
if self.cargo().startswith(self.bin_root()) and \
180180
(not os.path.exists(self.cargo()) or self.cargo_out_of_date()):
181181
self.print_what_it_means_to_bootstrap()
182-
channel = self.stage0_cargo_channel()
183-
filename = "cargo-{}-{}.tar.gz".format(channel, self.build)
184-
url = "https://static.rust-lang.org/cargo-dist/" + self.stage0_cargo_date()
182+
filename = "cargo-nightly-{}.tar.gz".format(self.build)
183+
url = "https://s3.amazonaws.com/rust-lang-ci/cargo-builds/" + self.stage0_cargo_rev()
185184
tarball = os.path.join(cargo_cache, filename)
186185
if not os.path.exists(tarball):
187186
get("{}/{}".format(url, filename), tarball, verbose=self.verbose)
188187
unpack(tarball, self.bin_root(), match="cargo", verbose=self.verbose)
189188
with open(self.cargo_stamp(), 'w') as f:
190-
f.write(self.stage0_cargo_date())
189+
f.write(self.stage0_cargo_rev())
191190

192-
def stage0_cargo_date(self):
193-
return self._cargo_date
194-
195-
def stage0_cargo_channel(self):
196-
return self._cargo_channel
191+
def stage0_cargo_rev(self):
192+
return self._cargo_rev
197193

198194
def stage0_rustc_date(self):
199195
return self._rustc_date
@@ -217,7 +213,7 @@ def cargo_out_of_date(self):
217213
if not os.path.exists(self.cargo_stamp()) or self.clean:
218214
return True
219215
with open(self.cargo_stamp(), 'r') as f:
220-
return self.stage0_cargo_date() != f.read()
216+
return self.stage0_cargo_rev() != f.read()
221217

222218
def bin_root(self):
223219
return os.path.join(self.build_dir, self.build, "stage0")
@@ -469,7 +465,7 @@ def main():
469465

470466
data = stage0_data(rb.rust_root)
471467
rb._rustc_channel, rb._rustc_date = data['rustc'].split('-', 1)
472-
rb._cargo_channel, rb._cargo_date = data['cargo'].split('-', 1)
468+
rb._cargo_rev = data['cargo']
473469

474470
start_time = time()
475471

Diff for: ‎src/bootstrap/check.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
//! This file implements the various regression test suites that we execute on
1414
//! our CI.
1515
16+
extern crate build_helper;
17+
1618
use std::collections::HashSet;
1719
use std::env;
1820
use std::fmt;
@@ -543,7 +545,7 @@ pub fn distcheck(build: &Build) {
543545
build.run(&mut cmd);
544546
build.run(Command::new("./configure")
545547
.current_dir(&dir));
546-
build.run(Command::new("make")
548+
build.run(Command::new(build_helper::make(&build.config.build))
547549
.arg("check")
548550
.current_dir(&dir));
549551
}

Diff for: ‎src/bootstrap/config.rs

+12
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ pub struct Target {
113113
#[derive(RustcDecodable, Default)]
114114
struct TomlConfig {
115115
build: Option<Build>,
116+
install: Option<Install>,
116117
llvm: Option<Llvm>,
117118
rust: Option<Rust>,
118119
target: Option<HashMap<String, TomlTarget>>,
@@ -135,6 +136,12 @@ struct Build {
135136
python: Option<String>,
136137
}
137138

139+
/// TOML representation of various global install decisions.
140+
#[derive(RustcDecodable, Default, Clone)]
141+
struct Install {
142+
prefix: Option<String>,
143+
}
144+
138145
/// TOML representation of how the LLVM build is configured.
139146
#[derive(RustcDecodable, Default)]
140147
struct Llvm {
@@ -258,6 +265,10 @@ impl Config {
258265
set(&mut config.submodules, build.submodules);
259266
set(&mut config.vendor, build.vendor);
260267

268+
if let Some(ref install) = toml.install {
269+
config.prefix = install.prefix.clone();
270+
}
271+
261272
if let Some(ref llvm) = toml.llvm {
262273
match llvm.ccache {
263274
Some(StringOrBool::String(ref s)) => {
@@ -275,6 +286,7 @@ impl Config {
275286
set(&mut config.llvm_version_check, llvm.version_check);
276287
set(&mut config.llvm_static_stdcpp, llvm.static_libstdcpp);
277288
}
289+
278290
if let Some(ref rust) = toml.rust {
279291
set(&mut config.rust_debug_assertions, rust.debug_assertions);
280292
set(&mut config.rust_debuginfo, rust.debuginfo);

Diff for: ‎src/bootstrap/config.toml.example

+8
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@
100100
# Indicate whether the vendored sources are used for Rust dependencies or not
101101
#vendor = false
102102

103+
# =============================================================================
104+
# General install configuration options
105+
# =============================================================================
106+
[install]
107+
108+
# Instead of installing to /usr/local, install to this path instead.
109+
#prefix = "/path/to/install"
110+
103111
# =============================================================================
104112
# Options for compiling Rust code itself
105113
# =============================================================================

Diff for: ‎src/bootstrap/dist.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,14 @@ pub fn analysis(build: &Build, compiler: &Compiler, target: &str) {
346346
}
347347

348348
/// Creates the `rust-src` installer component and the plain source tarball
349-
pub fn rust_src(build: &Build) {
349+
pub fn rust_src(build: &Build, host: &str) {
350350
println!("Dist src");
351+
352+
if host != build.config.build {
353+
println!("\tskipping, not a build host");
354+
return
355+
}
356+
351357
let plain_name = format!("rustc-{}-src", package_vers(build));
352358
let name = format!("rust-src-{}", package_vers(build));
353359
let image = tmpdir(build).join(format!("{}-image", name));

Diff for: ‎src/bootstrap/flags.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ To learn more about a subcommand, run `./x.py <command> -h`
280280

281281
Flags {
282282
verbose: m.opt_count("v"),
283-
stage: m.opt_str("stage").map(|j| j.parse().unwrap()),
283+
stage: stage,
284284
keep_stage: m.opt_str("keep-stage").map(|j| j.parse().unwrap()),
285285
build: m.opt_str("build").unwrap_or_else(|| {
286286
env::var("BUILD").unwrap()

Diff for: ‎src/bootstrap/lib.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
//! More documentation can be found in each respective module below, and you can
6565
//! also check out the `src/bootstrap/README.md` file for more information.
6666
67+
#![deny(warnings)]
68+
6769
extern crate build_helper;
6870
extern crate cmake;
6971
extern crate filetime;
@@ -721,7 +723,8 @@ impl Build {
721723
fn llvm_filecheck(&self, target: &str) -> PathBuf {
722724
let target_config = self.config.target_config.get(target);
723725
if let Some(s) = target_config.and_then(|c| c.llvm_config.as_ref()) {
724-
s.parent().unwrap().join(exe("FileCheck", target))
726+
let llvm_bindir = output(Command::new(s).arg("--bindir"));
727+
Path::new(llvm_bindir.trim()).join(exe("FileCheck", target))
725728
} else {
726729
let base = self.llvm_out(&self.config.build).join("build");
727730
let exe = exe("FileCheck", target);

Diff for: ‎src/bootstrap/mk/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ tidy:
6666
check-stage2-T-arm-linux-androideabi-H-x86_64-unknown-linux-gnu:
6767
$(Q)$(BOOTSTRAP) test --target arm-linux-androideabi
6868
check-stage2-T-x86_64-unknown-linux-musl-H-x86_64-unknown-linux-gnu:
69-
$(Q)$(BOOTSTRAP) test --target x86_64-unknown-linux-gnu
69+
$(Q)$(BOOTSTRAP) test --target x86_64-unknown-linux-musl
7070

7171

7272
.PHONY: dist

Diff for: ‎src/bootstrap/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn check(build: &mut Build) {
143143
// Externally configured LLVM requires FileCheck to exist
144144
let filecheck = build.llvm_filecheck(&build.config.build);
145145
if !filecheck.starts_with(&build.out) && !filecheck.exists() && build.config.codegen_tests {
146-
panic!("filecheck executable {:?} does not exist", filecheck);
146+
panic!("FileCheck executable {:?} does not exist", filecheck);
147147
}
148148

149149
for target in build.config.target.iter() {

Diff for: ‎src/bootstrap/step.rs

+16-5
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,18 @@ pub fn build_rules(build: &Build) -> Rules {
267267
// nothing to do for debuginfo tests
268268
} else if build.config.build.contains("apple") {
269269
rules.test("check-debuginfo", "src/test/debuginfo")
270+
.default(true)
270271
.dep(|s| s.name("libtest"))
271-
.dep(|s| s.name("tool-compiletest").host(s.host))
272+
.dep(|s| s.name("tool-compiletest").target(s.host))
272273
.dep(|s| s.name("test-helpers"))
273274
.dep(|s| s.name("debugger-scripts"))
274275
.run(move |s| check::compiletest(build, &s.compiler(), s.target,
275276
"debuginfo-lldb", "debuginfo"));
276277
} else {
277278
rules.test("check-debuginfo", "src/test/debuginfo")
279+
.default(true)
278280
.dep(|s| s.name("libtest"))
279-
.dep(|s| s.name("tool-compiletest").host(s.host))
281+
.dep(|s| s.name("tool-compiletest").target(s.host))
280282
.dep(|s| s.name("test-helpers"))
281283
.dep(|s| s.name("debugger-scripts"))
282284
.run(move |s| check::compiletest(build, &s.compiler(), s.target,
@@ -455,7 +457,7 @@ pub fn build_rules(build: &Build) -> Rules {
455457
for (krate, path, default) in krates("test_shim") {
456458
rules.doc(&krate.doc_step, path)
457459
.dep(|s| s.name("libtest"))
458-
.default(default && build.config.docs)
460+
.default(default && build.config.compiler_docs)
459461
.run(move |s| doc::test(build, s.stage, s.target));
460462
}
461463
for (krate, path, default) in krates("rustc-main") {
@@ -496,7 +498,7 @@ pub fn build_rules(build: &Build) -> Rules {
496498
rules.dist("dist-src", "src")
497499
.default(true)
498500
.host(true)
499-
.run(move |_| dist::rust_src(build));
501+
.run(move |s| dist::rust_src(build, s.target));
500502
rules.dist("dist-docs", "src/doc")
501503
.default(true)
502504
.dep(|s| s.name("default:doc"))
@@ -820,7 +822,16 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd?
820822
let hosts = if self.build.flags.host.len() > 0 {
821823
&self.build.flags.host
822824
} else {
823-
&self.build.config.host
825+
if kind == Kind::Dist {
826+
// For 'dist' steps we only distribute artifacts built from
827+
// the build platform, so only consider that in the hosts
828+
// array.
829+
// NOTE: This relies on the fact that the build triple is
830+
// always placed first, as done in `config.rs`.
831+
&self.build.config.host[..1]
832+
} else {
833+
&self.build.config.host
834+
}
824835
};
825836
let targets = if self.build.flags.target.len() > 0 {
826837
&self.build.flags.target

Diff for: ‎src/build_helper/lib.rs

+12
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ pub fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {
4747
None
4848
} else if target.contains("musl") {
4949
Some(PathBuf::from("ar"))
50+
} else if target.contains("openbsd") {
51+
Some(PathBuf::from("ar"))
5052
} else {
5153
let parent = cc.parent().unwrap();
5254
let file = cc.file_name().unwrap().to_str().unwrap();
@@ -61,6 +63,16 @@ pub fn cc2ar(cc: &Path, target: &str) -> Option<PathBuf> {
6163
}
6264
}
6365

66+
pub fn make(host: &str) -> PathBuf {
67+
if host.contains("bitrig") || host.contains("dragonfly") ||
68+
host.contains("freebsd") || host.contains("netbsd") ||
69+
host.contains("openbsd") {
70+
PathBuf::from("gmake")
71+
} else {
72+
PathBuf::from("make")
73+
}
74+
}
75+
6476
pub fn output(cmd: &mut Command) -> String {
6577
let output = match cmd.stderr(Stdio::inherit()).output() {
6678
Ok(status) => status,

Diff for: ‎src/ci/docker/run.sh

+11-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,23 @@ docker \
2828
mkdir -p $HOME/.cargo
2929
mkdir -p $root_dir/obj
3030

31+
args=
32+
if [ "$SCCACHE_BUCKET" != "" ]; then
33+
args="$args --env SCCACHE_BUCKET=$SCCACHE_BUCKET"
34+
args="$args --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID"
35+
args="$args --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
36+
else
37+
mkdir -p $HOME/.cache/sccache
38+
args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"
39+
fi
40+
3141
exec docker \
3242
run \
3343
--volume "$root_dir:/checkout:ro" \
3444
--volume "$root_dir/obj:/checkout/obj" \
3545
--workdir /checkout/obj \
3646
--env SRC=/checkout \
37-
--env SCCACHE_BUCKET=$SCCACHE_BUCKET \
38-
--env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
39-
--env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
47+
$args \
4048
--env CARGO_HOME=/cargo \
4149
--env LOCAL_USER_ID=`id -u` \
4250
--volume "$HOME/.cargo:/cargo" \

Diff for: ‎src/ci/docker/x86_64-gnu-cargotest/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1212
ccache \
1313
libssl-dev \
1414
sudo \
15-
xz-utils
15+
xz-utils \
16+
pkg-config
1617

1718
ENV SCCACHE_DIGEST=7237e38e029342fa27b7ac25412cb9d52554008b12389727320bd533fd7f05b6a96d55485f305caf95e5c8f5f97c3313e10012ccad3e752aba2518f3522ba783
1819
RUN curl -L https://api.pub.build.mozilla.org/tooltool/sha512/$SCCACHE_DIGEST | \

Diff for: ‎src/doc/reference.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,8 @@ of an item to see whether it should be allowed or not. This is where privacy
17311731
warnings are generated, or otherwise "you used a private item of another module
17321732
and weren't allowed to."
17331733

1734-
By default, everything in Rust is *private*, with one exception. Enum variants
1734+
By default, everything in Rust is *private*, with two exceptions: Associated
1735+
items in a `pub` Trait are public by default; Enum variants
17351736
in a `pub` enum are also public by default. When an item is declared as `pub`,
17361737
it can be thought of as being accessible to the outside world. For example:
17371738

Diff for: ‎src/liballoc_jemalloc/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fn main() {
151151
cmd.arg(format!("--build={}", build_helper::gnu_target(&host)));
152152

153153
run(&mut cmd);
154-
let mut make = Command::new("make");
154+
let mut make = Command::new(build_helper::make(&host));
155155
make.current_dir(&build_dir)
156156
.arg("build_lib_static");
157157

0 commit comments

Comments
 (0)