Skip to content

Rollup of 5 pull requests #64598

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.

Sign up for GitHub

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

Merged
merged 24 commits into from
Sep 19, 2019
Merged

Rollup of 5 pull requests #64598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
166719a
Update installed compiler dependencies
andjo403 Aug 31, 2019
9f4351d
Bless output of test borrowck/return-local-binding-from-desugaring.rs…
lqd Sep 17, 2019
222e920
Bless output of test borrowck/return-local-binding-from-desugaring.rs…
lqd Sep 17, 2019
3ef980a
Update expectations of test ui/dropck/dropck_trait_cycle_checked.rs f…
lqd Sep 17, 2019
34d3167
Bless json output of test ui/json-multiple.rs for Polonius
lqd Sep 17, 2019
f9c7329
Bless json output of test ui/json-options.rs for Polonius
lqd Sep 17, 2019
ceb72e4
Add generic dataflow impl
ecstatic-morse Sep 17, 2019
5496a1f
Document new dataflow analysis
ecstatic-morse Sep 18, 2019
2886037
Temporarily add `#[allow(unused)]` for CI
ecstatic-morse Sep 18, 2019
d583fef
Add ignore reason to placate `tidy`
ecstatic-morse Sep 18, 2019
cbaaf05
Fix `Analysis` example
ecstatic-morse Sep 18, 2019
a526e4f
Use an associated const for `name`
ecstatic-morse Sep 18, 2019
19bf0f4
Fix typo
ecstatic-morse Sep 18, 2019
08aff1a
Publish `rustc_mir::dataflow` and remove `#[allow(unused)]`
ecstatic-morse Sep 18, 2019
a7f5252
Add summary of the current state and future plans
ecstatic-morse Sep 18, 2019
b4e94d9
Fix bug where `is_call_return_effect_applied` was never set
ecstatic-morse Sep 18, 2019
f233a4c
Fix a minor grammar nit, update UI tests
Sep 18, 2019
333230f
Restore whitespace
Sep 18, 2019
d440e13
Update Cargo
Aaron1011 Sep 16, 2019
d2b555e
Rollup merge of #63630 - andjo403:bump_compiler, r=nikomatsakis
Centril Sep 19, 2019
11a0b96
Rollup merge of #64536 - Aaron1011:cargo-crate-type, r=ehuss
Centril Sep 19, 2019
0835100
Rollup merge of #64554 - lqd:polonius_tests4, r=nikomatsakis
Centril Sep 19, 2019
67565ae
Rollup merge of #64566 - ecstatic-morse:generic-dataflow, r=oli-obk
Centril Sep 19, 2019
cad2d58
Rollup merge of #64591 - jamesmunns:grammar-fix, r=jonas-schievink
Centril Sep 19, 2019
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
32 changes: 29 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ dependencies = [
"atty",
"bytesize",
"cargo-test-macro",
"cargo-test-support",
"clap",
"core-foundation",
"crates-io",
Expand All @@ -286,8 +287,9 @@ dependencies = [
"git2",
"git2-curl",
"glob",
"hex",
"hex 0.4.0",
"home",
"humantime",
"ignore",
"im-rc",
"jobserver",
Expand Down Expand Up @@ -327,6 +329,23 @@ dependencies = [
name = "cargo-test-macro"
version = "0.1.0"

[[package]]
name = "cargo-test-support"
version = "0.1.0"
dependencies = [
"cargo",
"cargo-test-macro",
"filetime",
"flate2",
"git2",
"glob",
"lazy_static 1.3.0",
"remove_dir_all",
"serde_json",
"tar",
"url 2.1.0",
]

[[package]]
name = "cargo_metadata"
version = "0.8.0"
Expand Down Expand Up @@ -698,7 +717,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09de9ee0fc255ace04c7fa0763c9395a945c37c8292bb554f8d48361d1dcf1b4"
dependencies = [
"commoncrypto",
"hex",
"hex 0.3.2",
"openssl",
"winapi 0.3.6",
]
Expand Down Expand Up @@ -1260,6 +1279,12 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"

[[package]]
name = "hex"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"

[[package]]
name = "home"
version = "0.5.0"
Expand Down Expand Up @@ -2062,7 +2087,7 @@ dependencies = [
"directories",
"env_logger",
"getrandom",
"hex",
"hex 0.3.2",
"log",
"num-traits",
"rand 0.7.0",
Expand Down Expand Up @@ -3257,6 +3282,7 @@ dependencies = [
"serde",
"serde_json",
"smallvec",
"url 2.1.0",
"winapi 0.3.6",
]

Expand Down
13 changes: 12 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ or reading the [rustc guide][rustcguidebuild].
### Building on *nix
1. Make sure you have installed the dependencies:

* `g++` 4.7 or later or `clang++` 3.x or later
* `g++` 5.1 or later or `clang++` 3.5 or later
* `python` 2.7 (but not 3.x)
* GNU `make` 3.81 or later
* `cmake` 3.4.3 or later
Expand Down Expand Up @@ -151,6 +151,17 @@ by manually calling the appropriate vcvars file before running the bootstrap.
> python x.py build
```

### Building rustc with older host toolchains
It is still possible to build Rust with the older toolchain versions listed below, but only if the
LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN option is set to true in the config.toml file.

* Clang 3.1
* Apple Clang 3.1
* GCC 4.8
* Visual Studio 2015 (Update 3)

Toolchain versions older than what is listed above cannot be used to build rustc.

#### Specifying an ABI

Each specific ABI can also be used from either environment (for example, using
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/traits/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ impl IntercrateAmbiguityCause {
String::new()
};
format!(
"upstream crates may add new impl of trait `{}`{} \
"upstream crates may add a new impl of trait `{}`{} \
in future versions",
trait_desc, self_desc
)
Expand Down
Loading