Skip to content

Commit fbd34ef

Browse files
committedMar 26, 2019
Auto merge of #59433 - Centril:rollup, r=Centril
Rollup of 10 pull requests Successful merges: - #59150 (Expand suggestions for type ascription parse errors) - #59232 (Merge `Promoted` and `Static` in `mir::Place`) - #59267 (Provide suggestion when using field access instead of path) - #59315 (Add no_hash to query macro and move some queries over) - #59334 (Update build instructions in README.md) - #59362 (Demo `FromIterator` short-circuiting) - #59374 (Simplify checked_duration_since) - #59389 (replace redundant note in deprecation warning) - #59410 (Clarify `{Ord,f32,f64}::clamp` docs a little) - #59419 (Utilize `?` instead of `return None`.) Failed merges: r? @ghost
2 parents 07d3508 + 822b4fc commit fbd34ef

File tree

101 files changed

+1191
-698
lines changed

Some content is hidden

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

101 files changed

+1191
-698
lines changed
 

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -2811,6 +2811,7 @@ dependencies = [
28112811
name = "rustc_macros"
28122812
version = "0.1.0"
28132813
dependencies = [
2814+
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
28142815
"proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
28152816
"quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
28162817
"syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)",

‎README.md

+16
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,22 @@ of the rustc-guide instead._
4545
$ ./x.py build && sudo ./x.py install
4646
```
4747

48+
If after running `sudo ./x.py install` you see an error message like
49+
50+
```
51+
error: failed to load source for a dependency on 'cc'
52+
```
53+
54+
then run these two commands and then try `sudo ./x.py install` again:
55+
56+
```
57+
$ cargo install cargo-vendor
58+
```
59+
60+
```
61+
$ cargo vendor
62+
```
63+
4864
> ***Note:*** Install locations can be adjusted by copying the config file
4965
> from `./config.toml.example` to `./config.toml`, and
5066
> adjusting the `prefix` option under `[install]`. Various other options, such

0 commit comments

Comments
 (0)