Commit Graph

65554 Commits

Author SHA1 Message Date
bors
1143eb26a2 Auto merge of #42313 - pnkfelix:allocator-integration, r=alexcrichton
Allocator integration

Lets start getting some feedback on `trait Alloc`.

Here is:
 *  the `trait Alloc` itself,
 * the `struct Layout` and `enum AllocErr` that its API relies on
 * a `struct HeapAlloc` that exposes the system allocator as an instance of `Alloc`
 * an integration of `Alloc` with `RawVec`
 * ~~an integration of `Alloc` with `Vec`~~

 TODO
 * [x] split `fn realloc_in_place` into `grow` and `shrink` variants
 * [x] add `# Unsafety` and `# Errors` sections to documentation for all relevant methods
 * [x] remove `Vec` integration with `Allocator`
 * [x] add `allocate_zeroed` impl to `HeapAllocator`
 * [x] remove typedefs e.g. `type Size = usize;`
 * [x] impl `trait Error` for all error types in PR
 * [x] make `Layout::from_size_align` public
 * [x] clarify docs of `fn padding_needed_for`.
 * [x] revise `Layout` constructors to ensure that [size+align combination is valid](https://github.com/rust-lang/rust/pull/42313#issuecomment-306845446)
 * [x] resolve mismatch re requirements of align on dealloc. See [comment](https://github.com/rust-lang/rust/pull/42313#issuecomment-306202489).
2017-06-20 05:02:19 +00:00
Jeremy Soller
c83a22c44a Disable repr(simd) in mem::swap on Redox 2017-06-19 21:00:30 -06:00
bors
e00c0401b8 Auto merge of #42754 - alexcrichton:update-cargo, r=jonathandturner
Update `wincolor` dep for Cargo

Closes rust-lang/cargo#4189
2017-06-20 02:34:41 +00:00
Giles Cope
26ed78c867 Updating cargo to include #4181. 2017-06-20 00:31:05 +01:00
Giles Cope
4b8446a233 Merge remote-tracking branch 'upstream/master' 2017-06-19 23:00:45 +01:00
Alex Crichton
55a629d496 Ignore a spuriously failing test on asmjs
Other tests are already ignored for missing `rust_begin_unwind`, let's add
another.
2017-06-19 12:40:51 -07:00
Seo Sanghyeon
05540bf08b Show type name for unused_must_use lint 2017-06-20 04:36:56 +09:00
Wesley Wiser
2bec12f036 Add compile_error!() to the unsable book 2017-06-19 14:29:30 -04:00
Wesley Wiser
0b29d26079 Add compile_error!
Related to #40872
2017-06-19 14:29:12 -04:00
Ariel Ben-Yehuda
4f1da874b8 Update LLVM to pick StackColoring improvement
Fixes #40883.
2017-06-19 20:55:56 +03:00
Alex Crichton
5bc4031e63 Update wincolor dep for Cargo
Closes rust-lang/cargo#4189
2017-06-19 10:44:12 -07:00
Ariel Ben-Yehuda
ae8545bd14 Memoize types in is_representable to avoid exponential worst-case
I could have made representability a cached query, but that would have
been added complexity for not much benefit - outside of the exponential
worst-case, this pass is fast enough already.

Fixes #42747.
2017-06-19 18:44:57 +03:00
Alex Crichton
609d43a15a Minor Allocator doc fix 2017-06-19 07:51:00 -07:00
Alex Crichton
879ec55d2e Ignore test for not-closed issue
Confirmed on IRC that the bug isn't fully fixed, and the "resurgence" here isn't
the fault of this PR.
2017-06-19 07:49:50 -07:00
bors
04145943a2 Auto merge of #39409 - pnkfelix:mir-borrowck2, r=nikomatsakis
MIR EndRegion Statements (was MIR dataflow for Borrows)

This PR adds an `EndRegion` statement to MIR (where the `EndRegion` statement is what terminates a borrow).

An earlier version of the PR implemented a dataflow analysis on borrow expressions, but I am now factoring that into a follow-up PR so that reviewing this one is easier. (And also because there are some revisions I want to make to that dataflow code, but I want this PR to get out of WIP status...)

This is a baby step towards MIR borrowck. I just want to get the review process going while I independently work on the remaining steps.
2017-06-19 13:01:27 +00:00
bors
5ce5126199 Auto merge of #42737 - fhahn:rust-log-crash, r=michaelwoerister
rustc: Check if def_path_hash_to_def_id is populated before accessing.

Without this patch, there is an ICE when running rustc with
RUST_LOG=debug. This patch updates extract_def_id to check if the map
has been populated before accessing it. This fixes the problem, but
maybe we do not need to compute the incremental hashes maps in the first
place when we are not in incremental mode?
2017-06-19 08:45:00 +00:00
Jeffrey Seyfried
3c1af32abb resolve: fix perf bug. 2017-06-19 07:23:26 +00:00
bors
8525eb820b Auto merge of #42722 - est31:master, r=Mark-Simulacrum
Remove SUMMARY.md of the unstable book as its autogenerated

Its being autogenerated now, as of PR #42612.
It seems I forgot to remove it.

Also, sort the entries of SUMMARY.md alphabetically.
2017-06-19 03:42:27 +00:00
bors
8e26c0eb38 Auto merge of #42740 - arielb1:bad-arm-2, r=alexcrichton
Backport fixes to LLVM 4.0 ARM codegen bugs

So ARM had quite a few codegen bugs on LLVM 4.0 which are fixed on LLVM
trunk. This backports 5 of them:
r297871 - ARM: avoid clobbering register in v6 jump-table expansion.
    - fixes rust-lang/rust#42248
r294949 - [Thumb-1] TBB generation: spot redefinitions of index
r295816 - [ARM] Fix constant islands pass.
r300870 - [Thumb-1] Fix corner cases for compressed jump tables
r302650 - [IfConversion] Add missing check in
IfConversion/canFallThroughTo
    - unblocks rust-lang/rust#39409

r? @alexcrichton
beta-nominating because this fixes regressions introduced by LLVM 4.0.
2017-06-19 01:31:31 +00:00
bors
30322efee2 Auto merge of #42735 - arielb1:generic-closure-fn, r=eddyb
collector: apply param substs to closures cast to fn items

Fixes #42718.

r? @eddyb
beta-nominating because serious ICE in newly-stabilized feature.
2017-06-18 23:22:35 +00:00
Ariel Ben-Yehuda
207951b169 Backport fixes to LLVM 4.0 ARM codegen bugs
So ARM had quite a few codegen bugs on LLVM 4.0 which are fixed on LLVM
trunk. This backports 5 of them:
r297871 - ARM: avoid clobbering register in v6 jump-table expansion.
    - fixes rust-lang/rust#42248
r294949 - [Thumb-1] TBB generation: spot redefinitions of index
r295816 - [ARM] Fix constant islands pass.
r300870 - [Thumb-1] Fix corner cases for compressed jump tables
r302650 - [IfConversion] Add missing check in
IfConversion/canFallThroughTo
    - unblocks rust-lang/rust#39409
2017-06-19 00:53:27 +03:00
est31
696085faee Sort entries of SUMMARY.md alphabetically 2017-06-18 23:26:39 +02:00
est31
9f6fb8e88f Remove SUMMARY.md of the unstable book as its autogenerated
Its being autogenerated now, as of PR #42612.
It seems I forgot to remove it.
2017-06-18 23:26:39 +02:00
bors
10d7cb44c9 Auto merge of #42676 - alexcrichton:update-cargo, r=Mark-Simulacrum
Update cargo/rls submodules and dependencies

Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.
2017-06-18 21:10:33 +00:00
Mark Simulacrum
d09cf46d32 Update UI tests to be platform independent 2017-06-18 11:35:37 -06:00
bors
247a0184ff Auto merge of #42738 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 7 pull requests

- Successful merges: #42695, #42714, #42720, #42723, #42730, #42731, #42734
- Failed merges: #42722
2017-06-18 17:29:58 +00:00
Mark Simulacrum
effa869cab Update transmute size lints.
Also moves a few transmute tests to UI tests to better test their
output.
2017-06-18 10:36:07 -06:00
Mark Simulacrum
3bed3bd146 Rollup merge of #42734 - MaloJaffre:tests, r=Mark-Simulacrum
Add tests for various issues

Fixes #11740.
Fixes #19601.
Fixes #22603
Fixes #22789.
Fixes #26614.

r? @Mark-Simulacrum.
2017-06-18 10:34:14 -06:00
Mark Simulacrum
db9c12c2ef Rollup merge of #42731 - MaloJaffre:issue-24889, r=Mark-Simulacrum
Add test for #24889

Fixes #24889.
r? @Mark-Simulacrum (Thanks for the instructions).
2017-06-18 10:34:13 -06:00
Mark Simulacrum
27a3f7340a Rollup merge of #42730 - VBChunguk:boxed-wild-pattern, r=eddyb
Use T as the subpattern type of Box<T>

The subpattern type of boxes being nil does not make sense because of box patterns. They should have their inner type as the subpattern type.

Fixes #42679, which describes ICE caused by the bug.
2017-06-18 10:34:12 -06:00
Mark Simulacrum
2068596a54 Rollup merge of #42723 - ubsan:master, r=QuietMisdreavus
Add `_` to the list of keywords

also, make sure the keyword table is correctly spaced

note: the reference also needs to be updated. This is not the only way to do this in the grammar, but it's my preferred way.
2017-06-18 10:34:11 -06:00
Mark Simulacrum
c982529327 Rollup merge of #42720 - murarth:deprecated-collections, r=alexcrichton
Reintroduce deprecated `collections` crate
2017-06-18 10:34:10 -06:00
Mark Simulacrum
9b4c4d001f Rollup merge of #42714 - alexbool:master, r=alexcrichton
Inline StrSearcher::haystack()
2017-06-18 10:34:09 -06:00
Mark Simulacrum
7eff974454 Rollup merge of #42695 - Mark-Simulacrum:fix-verbose, r=alexcrichton
Use custom cargo/rustc paths when parsing flags.

Fixes https://github.com/rust-lang/rust/issues/41779, probably also https://github.com/rust-lang/rust/issues/42543 (I think they're duplicates).

I'm not entirely happy with the implementation, since it means we parse the configuration twice, but it's the minimal solution. I think the other choice is to move both calls to Config::parse inside Flags::parse and merge them, but I don't know if that's a good idea.

r? @alexcrichton
2017-06-18 10:34:08 -06:00
Malo Jaffré
5fe89e8eb1 Add tests for various issues
Fixes #11740.
Fixes #19601.
Fixes #22603
Fixes #22789.
Fixes #26614.

r? @Mark-Simulacrum.
2017-06-18 18:18:08 +02:00
Florian Hahn
8723f28772 rustc: Check if def_path_hash_to_def_id is populated before accessing it.
Without this patch, there is an ICE when running rustc with
RUST_LOG=debug. This patch updates extract_def_id to check if the map
has been populated before accessing it. This fixes the problem, but
maybe we do not need to compute the incremental hashes maps in the first
place when we are not in incremental mode?
2017-06-18 17:01:25 +01:00
Ariel Ben-Yehuda
09219d6a49 collector: apply param substs to closures cast to fn items
Fixes #42718.
2017-06-18 18:57:39 +03:00
Malo Jaffré
a5403d09f5 Add test for #24889
Fixes #24889.
r? @Mark-Simulacrum.
2017-06-18 14:30:33 +02:00
bors
28cc0c5a7b Auto merge of #42593 - ibabushkin:on-demand-external-source, r=eddyb
Implement lazy loading of external crates' sources. Fixes #38875

Fixes #38875. This is a follow-up to #42507. When a (now correctly translated) span from an external crate is referenced in a error, warning or info message, we still don't have the source code being referenced.
Since stuffing the source in the serialized metadata of an rlib is extremely wasteful, the following scheme has been implemented:

* File maps now contain a source hash that gets serialized as well.
* When a span is rendered in a message, the source hash in the corresponding file map(s) is used to try and load the source from the corresponding file on disk. If the file is not found or the hashes don't match, the failed attempt is recorded (and not retried).
* The machinery fetching source lines from file maps is augmented to use the lazily loaded external source as a secondary fallback for file maps belonging to external crates.

This required a small change to the expected stderr of one UI test (it now renders a span, where previously was none).

Further work can be done based on this - some of the machinery previously used to hide external spans is possibly obsolete and the hashing code can be reused in different places as well.

r? @eddyb
2017-06-18 10:41:05 +00:00
Wonwoo Choi
abebe8afde Use T as the subpattern type of Box<T>
The subpattern type of boxes being nil does not make sense because of
box patterns. They should have their inner type as the subpattern type.
2017-06-18 16:07:26 +09:00
Murarth
6484258f17 Reintroduce deprecated collections crate 2017-06-17 13:18:18 -07:00
ubsan
723772fc55 Add _ to the list of keywords
also, make sure the keyword table is correctly spaced
2017-06-17 13:14:26 -07:00
Oliver Middleton
222a328f5c Convert Into<Box<[T]>> for Vec<T> into From<Vec<T>> for Box<[T]> 2017-06-17 20:49:21 +01:00
Alex Crichton
1cede109d8 Update cargo/rls submodules and dependencies
Brings in a few regression fixes on the Cargo side, updates the rls to work
with the newer Cargo, and also updates other crates.io dependencies to pull in
various bug fixes and such.
2017-06-17 12:00:49 -07:00
Alex Crichton
5354b91ce5 Correct location of unstable book docs 2017-06-17 11:48:01 -07:00
bors
78d8416caf Auto merge of #42649 - estebank:if-cond, r=nikomatsakis
Report error for assignment in `if` condition

For code like `if x = 3 {}`, output:

```
error[E0308]: mismatched types
  --> $DIR/issue-17283.rs:25:8
   |
25 |     if x = x {
   |        ^^^^^
   |        |
   |        help: did you mean to compare equality? `x == x`
   |        expected bool, found ()
   |
   = note: expected type `bool`
              found type `()`
```

Fix #40926.
2017-06-17 16:54:07 +00:00
John Kåre Alsaker
1409e707a2 Fix formatting 2017-06-17 14:46:37 +02:00
bors
dfb8c80e11 Auto merge of #42659 - nikomatsakis:issue-42545-type-inference-regression, r=eddyb
Issue 42545 type inference regression

Fix an ICE that results from type inference obligations being dropped on the floor. Specifically, when computing the implied bounds, we would sometimes do normalizations that get stored in the cache, but we would *not* try to solve the resulting obligations. This can sometimes leave type variables uninferred. Occurs only rarely because implied bounds are processed in regionck which happens very late, so usually the cache is populated already from somewhere else.

I think that the *proper* fix here is probably lazy normalization. This fix is intentionally very narrow both because this code is on the chopping block and because this needs a beta backport.

r? @eddyb
cc @arielb1
2017-06-17 11:22:08 +00:00
Alexander Bulaev
ca52d80338 Inline StrSearcher::haystack() 2017-06-17 13:51:36 +03:00
Niko Matsakis
9fec4093df register the obligations from wf::implied_bounds
Fixes #42552.
Fixes #42545.
2017-06-17 05:40:39 -04:00