Commit Graph

68908 Commits

Author SHA1 Message Date
Oliver Schneider
1ee0ff3bfe
Add a regression test for the const eval type resolution 2017-10-25 10:17:20 +02:00
Oliver Schneider
490742e339
Resolve types properly in const eval 2017-10-25 10:17:20 +02:00
bors
6e61bbabe4 Auto merge of #45455 - kennytm:print-extern-impl-for-e0119, r=nikomatsakis
Improve diagnostic of E0119 with extern crate, try to print the conflicting impl.

Closes #27403.
Closes #23563.

Should improve #23980.

The diagnostic now looks like:

```
error[E0119]: conflicting implementations of trait `std::convert::Into<_>` for type `GenX<_>`:
  --> $DIR/issue-27403.rs:15:1
   |
15 | / impl<S> Into<S> for GenX<S> {
16 | |     fn into(self) -> S {
17 | |         self.inner
18 | |     }
19 | | }
   | |_^
   |
   = note: conflicting implementation in crate `core`:
           - impl<T, U> std::convert::Into<U> for T
             where U: std::convert::From<T>;

error: aborting due to previous error
```
2017-10-25 02:24:03 +00:00
bors
aa40292e78 Auto merge of #44603 - SimonSapin:stylo, r=alexcrichton
Add Stylo and WebRender to src/tools/cargotest

This is a subset of Servo that takes relatively less time to compile and does not use unstable Rust features.
2017-10-24 23:30:15 +00:00
bors
c2799fc9a5 Auto merge of #45446 - leodasvacas:remove-libcollections, r=alexcrichton
Remove deprecated `collections` crate.

The real `collections` was merged with `alloc`, this facade was introduced [in this PR](https://github.com/rust-lang/rust/pull/42720) to give `#[no_std]` users time to adapt. This was done at least two cycles ago, now we can consider removing it for good.
2017-10-24 20:46:17 +00:00
Simon Sapin
daf84db4d2 Add WebRender to cargotest 2017-10-24 21:41:33 +02:00
Simon Sapin
9d2e83e759 Add Stylo to cargotest 2017-10-24 21:41:33 +02:00
bors
61af75437d Auto merge of #45350 - cjkenn:cjkenn/used-trait-imports, r=nikomatsakis
Put used trait imports field into a distinct query

Implementation for #45214

r+ @nikomatsakis
2017-10-24 15:18:08 +00:00
bors
fbc3642ef1 Auto merge of #45401 - zackmdavis:crate_shorthand_visibility_modifier, r=nikomatsakis
`crate` shorthand visibility modifier

cc #45388.

r? @nikomatsakis
2017-10-24 12:24:16 +00:00
bors
a789fa0440 Auto merge of #44984 - Maaarcocr:master, r=nikomatsakis
Create NormalizeTy query

As part of the effort to solve #44891,  I've created the normalize_ty query.

As outlined in the issue this meant:

- renamed `normalize_associated_type()` to `normalize_associated_type_in()`
- created the `normalize_ty` query
- substituted the use of memoize with the query

This PR is not ready. While running tests, one of the incremental ones failed. [This](https://pastebin.com/vGhH6bv6) is the error I got.
2017-10-24 03:55:22 +00:00
bors
336624735c Auto merge of #44766 - sunjay:lift_generics, r=nikomatsakis
Move Generics from MethodSig to TraitItem and ImplItem

As part of `rust-impl-period/WG-compiler-traits`, we want to "lift" `Generics` from `MethodSig` into `TraitItem` and `ImplItem`. This is in preparation for adding associated type generics. (https://github.com/rust-lang/rust/issues/44265#issuecomment-331172238)

Currently this change is only made in the AST. In the future, it may also impact the HIR. (Still discussing)

To understand this PR, it's probably best to start from the changes to `ast.rs` and then work your way to the other files to understand the far reaching effects of this change.

r? @nikomatsakis
2017-10-24 01:20:09 +00:00
Niko Matsakis
4b0f004e3d update inherent_impls tests
Now that we are visiting things in a different order during lowering,
adding parameters winds up affecting the HirIds assigned to thinks in
the method body, whereas it didn't before. We could fix this by
reordering the order in which we visit `generics` during lowering, but
this feels very fragile. Seems better to just let typeck tables be
dirty here.
2017-10-23 16:18:00 -04:00
Simon Sapin
f4f18586e7 Move cargotest to separate jobs on Travis-CI and AppVeyor 2017-10-23 13:12:12 +02:00
Simon Sapin
5167aac3c4 Extend cargotest to specify packages to test (within a Cargo workspace). 2017-10-23 13:11:12 +02:00
Zack M. Davis
214b0f2293 crate shorthand visibility modifier
With regrets, this breaks rustfmt and rls.

This is in the matter of #45388.
2017-10-22 23:58:13 -07:00
bors
4c053db233 Auto merge of #45451 - durka:patch-45, r=steveklabnik
fix stringify docs

Update `stringify!` docs to show actual accepted syntax. Reported [on reddit](https://www.reddit.com/r/rust/comments/76o8rh/hey_rustaceans_got_an_easy_question_ask_here/dopzwys/).
2017-10-22 23:02:15 +00:00
bors
8493813cd8 Auto merge of #45429 - frewsxcv:frewsxcv-once-docs, r=quietmisdreavus
Improve docs around `Once::call_once_force` and `OnceState`.

Added some examples, clarify behavior, etc etc.

Fixes https://github.com/rust-lang/rust/issues/43472.
2017-10-22 20:26:32 +00:00
kennytm
9d050069bb
Print the conflicting impl on E0119 with external crate. 2017-10-23 04:23:40 +08:00
bors
1babcd0393 Auto merge of #45304 - kennytm:travis-color-color-conflict, r=aturon
Fix rustbuild --color conflict when building on Travis outside of Docker

When trying to build rust on Travis without using `stamp` or `docker`, both `RUSTC_COLOR=1` and `TRAVIS=true` will separately pass `--color always` to the command line. This causes the build to fail due to "*Option 'color' given more than once*".

In this PR, the `RUSTC_COLOR=1` will not be passed in the CI environment.
2017-10-22 17:52:55 +00:00
Alex Burka
365eafbc7f fix stringify docs in std 2017-10-22 13:17:23 -04:00
Alex Burka
42ad2d7c31 fix stringify docs 2017-10-22 13:14:17 -04:00
leonardo.yvens
170f63e1c6 Don't build docs for removed libcollections. 2017-10-22 14:55:02 -02:00
leonardo.yvens
19aa23b6d3 Remove deprecated collections crate.
This reverts commit 6484258f17.
2017-10-22 14:55:02 -02:00
bors
fc1a03d7d0 Auto merge of #45442 - matthewjasper:const-dynamic-capture-error, r=petrochenkov
Cleanly error for non-const variable in associated const

Not sure if wrapping the whole `visit::walk_impl_item` call is correct.
Closes #44239
2017-10-22 15:17:08 +00:00
Corey Farwell
aae94c7368 Improve docs around Once::call_once_force and OnceState. 2017-10-22 10:25:31 -04:00
bors
942f31f5ea Auto merge of #45432 - ollie27:rustbuild_error_index_gen, r=Mark-Simulacrum
rustbuild: Build stage 1 error index generator at stage 0

At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.

It was broken by #44605.

r? @alexcrichton
2017-10-22 11:30:15 +00:00
bors
b6055cb7d2 Auto merge of #45433 - ollie27:rustbuild_nomicon, r=Mark-Simulacrum
rustbuild: Fix path for the nomicon
2017-10-22 08:55:06 +00:00
bors
5481098274 Auto merge of #45423 - durka:update-jobserver, r=Mark-Simulacrum
update jobserver version to work around macos bug

Update `jobserver` crate to fix rust-lang/cargo#4643, a panic which can't happen according to `libc::poll`'s man page but was nevertheless reported on macOS 10.9 and 10.10.

r? @alexcrichton
2017-10-22 03:13:16 +00:00
bors
1042190f8c Auto merge of #45400 - alexcrichton:bootstrap-thinlto, r=Mark-Simulacrum
rustbuild: Compile rustc with ThinLTO

This commit enables ThinLTO for the compiler as well as multiple codegen units.
This is intended to get the benefits of parallel codegen while also avoiding
any major loss of perf. Finally this commit is also intended as further testing
for #45320 and shaking out bugs.
2017-10-22 00:35:05 +00:00
Marco Concetto Rudilosso
5c51bf5297 renamed query 2017-10-21 22:50:21 +01:00
Marco Concetto Rudilosso
a3667d3209 anon NormalizeTy DepNode 2017-10-21 22:50:21 +01:00
Marco Concetto Rudilosso
20ae2d98c0 moved depnode 2017-10-21 22:50:21 +01:00
Marco Concetto Rudilosso
73c95431ee removed unused import 2017-10-21 22:50:21 +01:00
Marco Concetto Rudilosso
d870a96f28 trans_ -> fully_ prefix 2017-10-21 22:50:21 +01:00
Marco Concetto Rudilosso
f2ebe96c63 tidier 2017-10-21 22:50:20 +01:00
Marco Concetto Rudilosso
69f5f0d193 added trans_ prefix and pluralised types. Solved failing test on the incremental test-suite. 2017-10-21 22:50:20 +01:00
Marco Concetto Rudilosso
96a006c186 added newlines at the end of the file and changed 'normalising' to 'normalizing' 2017-10-21 22:50:20 +01:00
Marco Concetto Rudilosso
113ebe4f1d Create NormalizeTy query 2017-10-21 22:50:15 +01:00
bors
9ea3878dfe Auto merge of #45399 - alexcrichton:compress-parallel, r=michaelwoerister
rustc: Move bytecode compression into codegen

This commit moves compression of the bytecode from the `link` module to the
`write` module, namely allowing it to be (a) cached by incremental compilation
and (b) produced in parallel. The parallelization may show up as some nice wins
during normal compilation and the caching in incremental mode should be
beneficial for incremental compiles! (no more need to recompress the entire
crate's bitcode on all builds)
2017-10-21 21:40:08 +00:00
Alex Crichton
8197a0bbaf rustc: Move bytecode compression into codegen
This commit moves compression of the bytecode from the `link` module to the
`write` module, namely allowing it to be (a) cached by incremental compilation
and (b) produced in parallel. The parallelization may show up as some nice wins
during normal compilation and the caching in incremental mode should be
beneficial for incremental compiles! (no more need to recompress the entire
crate's bitcode on all builds)
2017-10-21 13:02:34 -07:00
bors
4279e2b4c1 Auto merge of #45393 - alexcrichton:update-musl, r=Mark-Simulacrum
ci: Update musl with new release

Apparently there's at least one CVE fixed in the new version of musl, and
because we're distributing it seems like a good opportunity to update!

Unfortunately it looks like #38618 still hasn't been fixed.
2017-10-21 19:02:41 +00:00
bors
ff8773d7be Auto merge of #45366 - ollie27:rustbuild_compiler_docs, r=alexcrichton
rustbuild: Don't try to build rustdoc API docs with compiler docs

rustdoc is built separately to rustc now so the docs would need to be
generated separately as well. Also rustdoc doesn't build at stage 1
which prevented the compiler docs being built at stage 1.

Fixes: #44629
2017-10-21 16:32:31 +00:00
Oliver Middleton
f820d2e567 rustbuild: Fix path for the nomicon 2017-10-21 17:16:46 +01:00
Oliver Middleton
2045e07745 rustbuild: Build stage 1 error index generator at stage 0
At stage 1 rustdoc is built at stage 0 so the error index generator should be as well.

This fixes `x.py --stage 1 doc` as rustdoc doesn't even build at stage 1.
2017-10-21 16:47:18 +01:00
bors
7e70546ddb Auto merge of #45430 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests

- Successful merges: #45227, #45356, #45407, #45411, #45418, #45419
- Failed merges: #45421
2017-10-21 14:04:15 +00:00
Corey Farwell
6ed7927fa0 Rollup merge of #45419 - steveklabnik:fix-commonmark-renderings, r=QuietMisdreavus
Fix most rendering warnings from switching to CommonMark

There's one big one lift, I'm filing a bug for it soon.

r? @rust-lang/docs
2017-10-21 09:47:25 -04:00
Corey Farwell
d86c5d00a2 Rollup merge of #45418 - Manishearth:update-coc, r=aturon
Remove "gender" from code of conduct, keep only "gender identity and expression"

Mirrors https://github.com/rust-lang/rust-www/pull/954 . See that pull
request for motivation.
2017-10-21 09:47:24 -04:00
Corey Farwell
c96db06e5b Rollup merge of #45411 - oli-obk:clippy, r=Manishearth
Reactivate clippy in toolstate.toml

The `Cargo.lock` changes are b/c clippy is not its own workspace anymore, but is part of the main workspace

r? @Manishearth
2017-10-21 09:47:23 -04:00
Corey Farwell
260131d40b Rollup merge of #45407 - topecongiro:fix-typos/librust-hir-README, r=kennytm
Fix typos in README.md
2017-10-21 09:47:22 -04:00
Corey Farwell
22e808a2fa Rollup merge of #45356 - neunenak:master, r=GuillaumeGomez
Add explanatory text for error E0599

Add a text description of this error instead of just example error code

r? GuillaumeGomez
2017-10-21 09:47:21 -04:00