bors
bd7021fd57
Auto merge of #46533 - nikomatsakis:ui-stamp-files, r=alexcrichton
...
compiletest: account for `ui` reference files when deciding to skip
The stamp files for compiletest were ignoring `.stderr` and `.stdout` files. This was driving me crazy.
r? @alexcrichton
2017-12-07 04:46:16 +00:00
bors
d516d5dff7
Auto merge of #46528 - CensoredUsername:stabilize_abi_sysv64, r=arielb1
...
Stabilize abi_sysv64
Closes #36167 , stabilizing the use of the "sysv64" ABI on x64 platforms where it is not the default ABI.
FCP on this is complete in the tracking issue.
2017-12-07 02:13:13 +00:00
Jonathan Strong
9307917d6a
Adds language to the documentation for Option
and Result
suggesting
...
the use of lazily evaluated alternatives when appropriate. These
comments are intended to echo a clippy lint on the same topic (see
https://rust-lang-nursery.github.io/rust-clippy/master/index.html#or_fun_call )
2017-12-06 20:30:57 -05:00
bors
061bdb5c12
Auto merge of #46524 - eddyb:static-static, r=arielb1
...
rustc_mir: promote references of statics from other statics.
Fixes #46522 by also allowing `STATIC_REF` in MIR const-qualification, not just AST rvalue promotion.
2017-12-06 23:42:17 +00:00
Eduard-Mihai Burtescu
292c6ac57f
rustc_mir: promote references of statics from other statics.
2017-12-07 01:18:34 +02:00
bors
5a2465e2b4
Auto merge of #45953 - estebank:tab-4, r=nikomatsakis
...
Display `\t` in diagnostics code as four spaces
Follow up to #44386 using the unicode variable width machinery from #45711 to replace tabs in the source code when displaying a diagnostic error with four spaces (instead of only one), while properly accounting for this when calculating underlines.
Partly addresses #44618 .
2017-12-06 21:05:53 +00:00
bors
cf30759a84
Auto merge of #46268 - arielb1:union-borrow, r=nikomatsakis
...
MIR borrowck: implement union-and-array-compatible semantics
Fixes #44831 .
Fixes #44834 .
Fixes #45537 .
Fixes #45696 (by implementing DerefPure semantics, which is what we want going forward).
r? @nikomatsakis
2017-12-06 18:30:15 +00:00
Michael Howell
a126a732eb
Fix overlong line length
2017-12-06 10:54:50 -07:00
Michael Howell
d6ba2e4d1c
Fix dangling close paren
2017-12-06 10:54:03 -07:00
bors
833785b090
Auto merge of #46538 - frewsxcv:rollup, r=frewsxcv
...
Rollup of 7 pull requests
- Successful merges: #46136 , #46378 , #46431 , #46483 , #46495 , #46502 , #46512
- Failed merges:
2017-12-06 14:53:37 +00:00
Niko Matsakis
7b456c053c
pacify the mercilous tidy
2017-12-06 09:42:09 -05:00
Oliver Schneider
77faf79c0e
Do not automatically merge Cargo.lock
2017-12-06 15:41:46 +01:00
Corey Farwell
bb239e294e
Rollup merge of #46512 - Havvy:doc-compile_fail, r=kennytm
...
Give compile_error macro examples
I cannot get Rust to build at all with it complaining about GCC not being a valid C compiler or something, so letting TravisCI be my tester...
Fixes #46171
2017-12-06 09:35:41 -05:00
Corey Farwell
872c0259b6
Rollup merge of #46502 - GuillaumeGomez:improve-search-style, r=QuietMisdreavus
...
Improve search style
Fixes #46494 .
r? @QuietMisdreavus
2017-12-06 09:35:40 -05:00
Corey Farwell
17dd988e72
Rollup merge of #46495 - timotree3:patch-1, r=nikomatsakis
...
Update old link
The CONTRIBUTING.md page currently links to an old wiki page in rust-lang/rust-wiki-backup. There is a more up-to-date page in-tree so I changed the link to point there so new contributors can find it more easily.
2017-12-06 09:35:39 -05:00
Corey Farwell
4a0647d1f9
Rollup merge of #46483 - frewsxcv:frewsxcv-ptr-swap, r=BurntSushi
...
Document behavior of `ptr::swap` with overlapping regions of memory.
Fixes https://github.com/rust-lang/rust/issues/44479 .
2017-12-06 09:35:38 -05:00
Corey Farwell
e5fd52bed2
Rollup merge of #46431 - steveklabnik:gh42725, r=QuietMisdreavus
...
Mention the name of ? in Result's docs
Fixes #42725
or at least, this is the best we can really do. #35946 is tracking
better errors already, so that should cover the other part of it.
2017-12-06 09:35:37 -05:00
Corey Farwell
f5e4aa2a80
Rollup merge of #46378 - udoprog:benches-rand, r=kennytm
...
Fix use of rand in liballoc benches
2017-12-06 09:35:36 -05:00
Corey Farwell
b5f11da0ac
Rollup merge of #46136 - tbu-:pr_werror, r=nikomatsakis
...
Clarify what `-D warnings` or `-F warnings` does
They set all lints currently on the warning level to `deny` or `forbid`,
respectively.
2017-12-06 09:35:35 -05:00
Simon Sapin
1cf11b3d0b
Rename fs::read_utf8 to read_string
2017-12-06 14:10:51 +01:00
Niko Matsakis
8681290240
compiletest: account for ui
reference files when deciding to skip
2017-12-06 06:31:10 -05:00
Niko Matsakis
a4cafe46c2
runtest: rustfmt
2017-12-06 06:20:58 -05:00
bors
632ad19135
Auto merge of #46192 - arielb1:locally-coherent, r=nikomatsakis
...
coherence: fix is_knowable logic
A trait-ref that passes the orphan-check rules can still be implemented in a crate downstream from our crate (for example, `LocalType for LocalTrait<_>` might be matched by a `LocalType for LocalTrait<TypeFromDownstreamCrate>`), and this should be known by the `is_knowable` logic.
Trait selection had a hackfix for this, but it's an hacky fix that does not handle all cases. This patch removes it.
fixes #43355 .
r? @nikomatsakis
Needs a crater run
2017-12-06 10:36:09 +00:00
Agustin Chiappe Berrini
65ccf24ce8
and refactor to just move the checking
2017-12-06 04:28:01 -05:00
bors
a62910baca
Auto merge of #46521 - SimonSapin:uninhabited-variants, r=eddyb
...
rustc_trans: don't write discriminants for uninhabited variants
Fixes #46519 .
Patch as suggested by eddyb: https://github.com/rust-lang/rust/issues/46519#issuecomment-349443519
2017-12-06 08:01:14 +00:00
bors
6a5895c433
Auto merge of #46530 - nrc:rls-update, r=alexcrichton
...
Update rls and rustfmt and set them testing
r? @alexcrichton
2017-12-06 05:29:39 +00:00
Nick Cameron
36c380292c
Update Cargo
2017-12-06 18:21:14 +13:00
Nick Cameron
75029259b3
Update rls and rustfmt
2017-12-06 18:18:44 +13:00
bors
d10b04d3df
Auto merge of #45898 - JRegimbal:master, r=QuietMisdreavus
...
Change "Types/modules" title of search tab to be more accurate
From issue #45787 . Used "In name" as per suggestion from @Seeker14491.
2017-12-06 03:02:17 +00:00
CensoredUsername
d68d127875
Stabilize abi_sysv64
2017-12-06 01:19:35 +01:00
Ariel Ben-Yehuda
9d3558725b
work around weird match arm lifetimes
2017-12-06 02:10:24 +02:00
Jeff Crocker
3f0cc7caca
Format function interface fingerprint hash tests
2017-12-05 15:27:14 -08:00
Jeff Crocker
104ebd2c43
Update 'while loop' fingerprint hash tests
2017-12-05 15:01:49 -08:00
Jeff Crocker
b8714c6040
Update 'while let loop' fingerprint hash tests
2017-12-05 14:57:35 -08:00
Ariel Ben-Yehuda
66c032cb2d
more comments
2017-12-06 00:51:47 +02:00
Jeff Crocker
3f48cbb455
Update loop expression fingerprint hash tests
2017-12-05 14:50:54 -08:00
Simon Sapin
d4fabb987b
rustc_trans: don't write discriminants for uninhabited variants
...
Fixes #46519 .
Patch as suggested by eddyb:
https://github.com/rust-lang/rust/issues/46519#issuecomment-349443519
2017-12-05 23:50:41 +01:00
Jeff Crocker
820ed30a85
Update inline asm fingerprint hash tests
2017-12-05 14:44:52 -08:00
Ariel Ben-Yehuda
425c2c3606
convert errors to warnings
2017-12-06 00:43:47 +02:00
Jeff Crocker
bc1754216d
Update function interface fingerprint hash tests
2017-12-05 14:40:13 -08:00
JRegimbal
41df62ce29
Changed tab names to those agreed upon.
...
Tabs are "In Names", "In Parameters", and "In Return Types".
2017-12-05 17:39:50 -05:00
Ariel Ben-Yehuda
37df5e0b91
adjust libcore
2017-12-06 00:34:02 +02:00
Ariel Ben-Yehuda
6b9fbb2ab8
fix borrows across loops, libcore *almost* compiles
2017-12-06 00:34:02 +02:00
Ariel Ben-Yehuda
82f3fc5dbc
fix handling of immutable variables
2017-12-06 00:34:02 +02:00
Ariel Ben-Yehuda
210f76816f
handle gen/kill sets together
2017-12-06 00:34:01 +02:00
Ariel Ben-Yehuda
243c5a5faa
fix handling of CallScopeData
...
This fixes the tests for issue #29793
2017-12-06 00:34:01 +02:00
Ariel Ben-Yehuda
cbcae7f694
improve conflict error reporting
2017-12-06 00:34:01 +02:00
Ariel Ben-Yehuda
f8c35d9e41
fix handling of consts in borrow-checking
...
I'm not sure how correct it this, but it gets whatever needs to compile
to compile.
2017-12-06 00:34:01 +02:00
Ariel Ben-Yehuda
87a8a70d0d
MIR borrowck: avoid formatting state when it is not needed
...
This improves performance on large functions.
2017-12-06 00:34:01 +02:00
Ariel Ben-Yehuda
6bc4b50511
MIR borrowck: implement union-and-array-compatible semantics
...
Fixes #44831 .
Fixes #44834 .
Fixes #45537 .
Fixes #45696 (by implementing DerefPure semantics, which is what we want
going forward).
2017-12-06 00:34:01 +02:00