Commit graph

18848 commits

Author SHA1 Message Date
Vadim Petrochenkov
f57ea7cb3d Make + in impl/dyn Trait non-associative 2018-01-27 22:38:28 +03:00
Vadim Petrochenkov
d79f7cde06 Add tests 2018-01-27 22:37:30 +03:00
Vadim Petrochenkov
95d27c3b79 syntax: Permit + in return types of function declarations
`+` is still disallowed in function types and function-like traits
2018-01-27 22:37:30 +03:00
Vadim Petrochenkov
873b77531c syntax: Lower priority of + in impl Trait/dyn Trait 2018-01-27 22:37:30 +03:00
leonardo.yvens
cd4de4cece Suppress unknown cast errors in the presence of other errors. 2018-01-27 15:42:55 -02:00
leonardo.yvens
4c0ff95e6e Be more explicit about how and why we need fallback in targets of casts 2018-01-27 15:42:54 -02:00
leonardo.yvens
02084f3304 No fallback in structurally_resolve_types. Further refactoring.
Put all fallback in `apply_fallback_if_possible`.
2018-01-27 15:42:54 -02:00
leonardo.yvens
3d83fc914a Lazy numeric fallback.
This refactoring tries to make numeric fallback easier to reason about.
Instead of applying all fallbacks at an arbitrary point in the middle
of inference, we apply the fallback only when necessary and only for
the variable that requires it, which for numeric fallback turns out to
be just casts.

The only visible consequence seems to be some error messages where
instead of getting `i32` we get `{integer}` because we are less eager
about fallback.

The bigger goal is to make it easier to integrate user fallbacks into
inference, if we ever figure that out.
2018-01-27 15:42:54 -02:00
Peter Hrvola
80b8c808ba Optimized error reporting for recursive requirements #47720 2018-01-27 18:19:39 +01:00
David Wood
f1c1db61e4
Updated other affected tests. 2018-01-27 13:33:10 +00:00
David Wood
dd6b005926
Added test for #45697 2018-01-27 13:33:09 +00:00
David Wood
71b7500241
Fix new test from rebase. 2018-01-27 11:46:28 +00:00
David Wood
6d00c9686b
Updated tests with fixed span location. 2018-01-27 11:46:22 +00:00
bors
6b99adeb11 Auto merge of #46450 - Gilnaa:libtest_json_output, r=nrc
Libtest json output

A revisit to my [last PR](https://github.com/rust-lang/rust/pull/45923).

Events are now more atomic, printed in a flat hierarchy.

For the normal test output:
```
running 1 test
test f ... FAILED

failures:

---- f stdout ----
	thread 'f' panicked at 'assertion failed: `(left == right)`
  left: `3`,
 right: `4`', f.rs:3:1
note: Run with `RUST_BACKTRACE=1` for a backtrace.

failures:
    f

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
```

The JSON equivalent is:
```
{ "type": "suite", "event": "started", "test_count": "1" }
{ "type": "test", "event": "started", "name": "f" }
{ "type": "test", "event": "failed", "name": "f" }
{ "type": "suite", "event": "failed", "passed": 0, "failed": 1, "allowed_fail": 0, "ignored": 0,  "measured": 0, "filtered_out": "0" }
{ "type": "test_output", "name": "f", "output": "thread 'f' panicked at 'assertion failed: `(left == right)`
  left: `3`,
 right: `4`', f.rs:3:1
note: Run with `RUST_BACKTRACE=1` for a backtrace.
" }
```
2018-01-27 10:56:56 +00:00
Gilad Naaman
8b7f1d0cec libtest: Fixed call to python in run-make 2018-01-27 11:50:01 +02:00
bors
6272b60dca Auto merge of #47690 - estebank:for-block-277, r=nikomatsakis
For E0277 on `for` loops, point at the "head" expression

When E0277's span points at a `for` loop, the actual issue is in the
element being iterated. Instead of pointing at the entire loop, point
only at the first line (when possible) so that the span ends in the
element for which E0277 was triggered.
2018-01-27 08:04:12 +00:00
Pulkit Goyal
5ce2b02997 don't mention tasks in stability warnings of #[thread_local] #47755
This is a fix for issue #47755.
2018-01-27 13:28:09 +05:30
Ryan Cumming
ed7e4e1e27 Expand union test to include different types 2018-01-27 14:26:14 +11:00
Ryan Cumming
75c79bdb02 Fix ICE on const eval of union field
MIR's `Const::get_field()` attempts to retrieve the value for a given
field in a constant. In the case of a union constant it was falling
through to a generic `const_get_elt` based on the field index. As union
fields don't have an index this caused an ICE in `llvm_field_index`.

Fix by simply returning the current value when accessing any field in a
union. This works because all union fields start at byte offset 0.

The added test uses `const_fn` it ensure the field is extracted using
MIR's const evaluation. The crash is reproducible without it, however.

Fixes #47788
2018-01-27 12:57:01 +11:00
Esteban Küber
ee06559576 Tweak presentation on lifetime trait mismatch 2018-01-26 16:38:07 -08:00
Esteban Küber
445e404ba4 Instead of modifying the item's span synthesize it 2018-01-26 15:06:09 -08:00
Esteban Küber
d0bd090efb Consider all whitespace when preparing span 2018-01-26 14:24:17 -08:00
Esteban Küber
a8f77e12fc Include space in suggestion mut in bindings 2018-01-26 14:24:17 -08:00
Esteban Küber
106e5c554d Don't add "in this macro invocation" label to desugared spans 2018-01-26 11:35:27 -08:00
Esteban Küber
f90c445637 Modify spans of expanded expression
Modify the spans used for `for`-loop expression expansion, instead of
creating a new span during error creation.
2018-01-26 11:05:02 -08:00
Gilad Naaman
360b26389c libtest: Split-up formatters.rs into smaller modules
libtest: Split HumanFormatter into {Pretty,Terse}

libtest: Fixed padding of benchmarks when not benchmarking

libtest: Fixed benchmarks' names not showing in terse-mode

libtest: Formatting
2018-01-26 19:46:04 +02:00
Gilad Naaman
adddb0f41a libtest: Added UI tests for --format=json
libtest: Remove usage of jq

libtest: Fixed UI tests

- Now comparing to the right file.
- A python script checks for validity of JSON documents
2018-01-26 19:46:04 +02:00
bors
bacb5c58df Auto merge of #47748 - alexcrichton:rollup, r=alexcrichton
Rollup of 19 pull requests

- Successful merges: #47415, #47437, #47439, #47453, #47460, #47502, #47529, #47600, #47607, #47618, #47626, #47656, #47668, #47696, #47701, #47705, #47710, #47711, #47719
- Failed merges: #47455, #47521
2018-01-26 17:41:36 +00:00
Alex Crichton
a06d333a14 Ignore a test on emscripten 2018-01-26 09:41:00 -08:00
varkor
aa6cc6e189 Fix test in macro_backtrace 2018-01-26 16:56:37 +00:00
Niko Matsakis
c48f46ba36 add regression test
Fixes #47139
2018-01-26 11:44:24 -05:00
varkor
adcb37e275 Add clarifying comment regarding the trailing type of a block 2018-01-26 15:39:19 +00:00
Alex Crichton
9bb18239de Fix a test case on Windows 2018-01-26 07:37:57 -08:00
varkor
0ac465924e Add line numbers and columns to error messages spanning multiple files
If an error message is emitted that spans several files, only the
primary file currently has line and column data attached. This is
useful information, even in files other than the one in which the error
occurs. We can often work out which line and column the error
corresponds to in other files — in this case it is helpful to add them
(in the case of ambiguity, the first relevant line/column is picked,
which is still helpful than none).
2018-01-26 15:33:05 +00:00
Alex Crichton
c915e3a10a Merge branch 'mlsm' of https://github.com/dotdash/rust into rollup 2018-01-26 06:53:18 -08:00
Alex Crichton
afc977fa23 Merge branch 'android-run-pass' of https://github.com/malbarbo/rust into rollup 2018-01-26 06:52:36 -08:00
Alex Crichton
e684525c74 Merge branch 'fix-regression' of https://github.com/estebank/rust into rollup 2018-01-26 06:52:21 -08:00
Alex Crichton
1dc85768d2 Merge branch 'rustdoc_masked' of https://github.com/ollie27/rust into rollup 2018-01-26 06:51:58 -08:00
Alex Crichton
a9101095e8 Merge branch 'simd-always-mem' of https://github.com/alexcrichton/rust into rollup 2018-01-26 06:51:43 -08:00
Alex Crichton
6da912e2a1 Merge branch 'explain' of https://github.com/estebank/rust into rollup 2018-01-26 06:50:31 -08:00
Alex Crichton
ac774e7a5b Shorten another test path for MSVC 2018-01-26 06:48:38 -08:00
bors
a97cd17f5d Auto merge of #47252 - Zoxc:backtrace-win, r=alexcrichton
Print inlined functions on Windows

Split from https://github.com/rust-lang/rust/pull/45637

r? @alexcrichton
2018-01-26 12:18:00 +00:00
Björn Steinbrink
aca88e185a Upgrade LLVM to incorporate a fix for #47364
Fixes #47364
2018-01-26 09:57:34 +01:00
Cldfire
c39ad4b145 Correctly format extern crate conflict resolution help 2018-01-25 22:36:48 -08:00
Alex Crichton
68f2e1ebf2 Ignore an i128 test on emscripten 2018-01-25 21:04:01 -08:00
John Kåre Alsaker
634f8cc06a Print inlined functions on Windows 2018-01-26 04:49:54 +01:00
Alex Crichton
6e1cebb387 Shorten a filename for MSVC 2018-01-25 18:11:42 -08:00
Alex Crichton
e61c609320 Merge branch 'configure-lto' of https://github.com/alexcrichton/rust into rollup 2018-01-25 13:50:42 -08:00
Alex Crichton
ad8b3135e1 Rollup merge of #47719 - malbarbo:run-pass-arch-powerpc, r=alexcrichton
Add powerpc to run-pass/conditional-compile-arch.rs
2018-01-25 13:49:56 -08:00
Alex Crichton
f7706d5816 Rollup merge of #47705 - pietroalbini:fix-47673, r=petrochenkov
Fix ICE when use trees have multiple empty nested groups

The issue was caused by an oversight of mine in the original use_nested_groups PR, where different paths were resolved with the same `NodeId` in some cases (such as in `use {{}, {}};`).

Fixes #47673
r? @petrochenkov
2018-01-25 13:49:53 -08:00