Commit Graph

97281 Commits

Author SHA1 Message Date
Lzu Tao
90fa7901b9 Postpone deprecating try! until 1.39.0 2019-08-09 02:29:44 +00:00
BO41
fd7ac6b17e Deprecate try! macro
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
Co-Authored-By: Oliver Middleton <olliemail27@gmail.com>
2019-08-09 02:29:44 +00:00
bors
2d1a551e14 Auto merge of #63380 - Centril:rollup-tzfhtnu, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #63261 (bump rand in libcore/liballoc test suites)
 - #63316 (Update rustfmt to 1.4.4)
 - #63332 (Add an overflow check in truncate implementation for Unix.)
 - #63342 (Don't use remap-path-prefix in dep-info files.)
 - #63366 (doc: Fix typo in float from bytes methods)
 - #63370 (Fix ICE #63364)
 - #63377 (Improved documentation for compile_error!())
 - #63379 (Add test for issue 53096)

Failed merges:

r? @ghost
2019-08-08 17:19:22 +00:00
Mazdak Farrokhzad
3de450b686
Rollup merge of #63379 - jackh726:issue-53096, r=Centril,oli-obk
Add test for issue 53096

Closes #53096

r? @oli-obk
2019-08-08 16:33:44 +02:00
Mazdak Farrokhzad
bba6dda2ad
Rollup merge of #63377 - SOF3:issues/63375, r=Centril
Improved documentation for compile_error!()

Fixes #63375
2019-08-08 16:33:43 +02:00
Mazdak Farrokhzad
499887ffb9
Rollup merge of #63370 - JohnTitor:fix-ice-63364, r=varkor
Fix ICE #63364

Fixes #63364

r? @estebank cc @varkor
2019-08-08 16:33:41 +02:00
Mazdak Farrokhzad
1514bc1c68
Rollup merge of #63366 - lzutao:fix-float-to-le-bytes-typo, r=Centril
doc: Fix typo in float from bytes methods

Thanks @That3Percent for pointing it out.
r? @Centril
2019-08-08 16:33:40 +02:00
Mazdak Farrokhzad
eeacbee580
Rollup merge of #63342 - ehuss:remap-path-dep-info, r=alexcrichton
Don't use remap-path-prefix in dep-info files.

This changes it so that dep-info files do not use remapped paths.

Having remapped paths causes problems with Cargo because if you remap to a nonexistent path (like `/rustc/$HASH` which rustc distributions do), then Cargo's change tracking thinks the files don't exist and will always rebuild.

I don't actually know if this is a good idea. I think it makes sense, but I do not know what the exact requirements are for reproducible builds. I consider these files separate from the binary artifacts generated, and as a build-system helper, so it seems reasonable to me.

I'm also not sure if this needs a test. I'll definitely add one on the cargo side if this is merged.

Closes #63329
2019-08-08 16:33:39 +02:00
Mazdak Farrokhzad
76938abba1
Rollup merge of #63332 - marmistrz:truncate, r=alexcrichton
Add an overflow check in truncate implementation for Unix.

Closes #63326.
cc @alexcrichton
2019-08-08 16:33:37 +02:00
Mazdak Farrokhzad
8fe2d9c4e9
Rollup merge of #63316 - topecongiro:rustfmt-1.4.4, r=Mark-Simulacrum
Update rustfmt to 1.4.4

The update includes bug fixes.
2019-08-08 16:33:36 +02:00
Mazdak Farrokhzad
8885dc2b37
Rollup merge of #63261 - RalfJung:rand, r=nikomatsakis
bump rand in libcore/liballoc test suites

This pulls in the fix for https://github.com/rust-random/rand/issues/779, which trips Miri when running these test suites.

`SmallRng` (formerly used by libcore) is no longer built by default, it needs a feature gate. I opted to switch to `StdRng` instead. Or should I enable the feature gate?
2019-08-08 16:33:34 +02:00
Jack
25a2cf6744 Move test 2019-08-08 10:13:55 -04:00
Jack
b8b8008254 Add test for issue 53096 2019-08-08 09:41:39 -04:00
SOFe
403292db35
Improved documentation for compile_error!()
Fixes #63375
2019-08-08 18:05:10 +08:00
Marcin Mielniczuk
3adbf63b11
Move the TryInto import into the inner scope 2019-08-08 11:44:59 +02:00
bors
2628f579f6 Auto merge of #63371 - Centril:rollup-k0xtdcz, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #62994 (Add test for #43398)
 - #63259 (Add tests for some issues)
 - #63327 (doc: Reword deprecation message of MetadataExt::as_raw_stat)
 - #63331 (Test conditional initialization validation in async fns)
 - #63334 (Update to rustc-guide that passes toolstate)
 - #63353 (Update books)
 - #63360 (Use consistent capitalization in -C/-Z help)

Failed merges:

r? @ghost
2019-08-08 09:06:45 +00:00
Mazdak Farrokhzad
83fbf620a0
Rollup merge of #63360 - brson:cz-help, r=Mark-Simulacrum
Use consistent capitalization in -C/-Z help

This code could also use a pass to consistify the grammar, but not by me atm.
2019-08-08 07:35:39 +02:00
Mazdak Farrokhzad
d37393c978
Rollup merge of #63353 - ehuss:update-books, r=ehuss
Update books

## nomicon

1 commits in b7f0aba2f88a8feade70595efcfa3438e54e96c0..8a7d05615e5bc0a7fb961b4919c44f5221ee54da
2019-07-11 15:11:36 -0400 to 2019-08-07 07:46:59 -0500
- s/railguard/guardrail/ (rust-lang-nursery/nomicon#156)

## reference

5 commits in 8e7d614303b0dec7492e048e63855fcd3b944ec8..b4b3536839042a6743fc76f0d9ad2a812020aeaa
2019-07-16 21:02:33 +0100 to 2019-08-07 02:29:50 +0200
- Update partially initialized values in drop documentation. (rust-lang-nursery/reference#648)
- Define sound and unsound (rust-lang-nursery/reference#647)
- Fix a type in the modules section: functions =&gt; modules (rust-lang-nursery/reference#645)
- Fix some links. (rust-lang-nursery/reference#642)
- Update recursion_limit default limit (rust-lang-nursery/reference#633)

## rust-by-example

14 commits in e3679e214d8db44586aca9b20aa27517007d1923..f2c15ba5ee89ae9469a2cf60494977749901d764
2019-07-15 11:13:44 -0300 to 2019-08-07 10:14:25 -0300
- Remove redundant semicolons (rust-lang/rust-by-example#1239)
- Rename "Read Lines" chapter title (rust-lang/rust-by-example#1230)
- Added space between word and inline code block in unit_testing.md (rust-lang/rust-by-example#1237)
- [typo] fix unit_testing wrong output (rust-lang/rust-by-example#1210)
- flow_control/match/binding.md: `...' -&gt; `..=' (rust-lang/rust-by-example#1233)
- generics/impl.md: follow rustfmt style (rust-lang/rust-by-example#1236)
- freeze.md: Incorrect example (rust-lang/rust-by-example#1226)
- Make `point` consistent (rust-lang/rust-by-example#1229)
- Fix typo at error -&gt; panic (rust-lang/rust-by-example#1227)
- Snake didn't deserve to die 🐍 (rust-lang/rust-by-example#1228)
- Reorder links in destructuring.md (rust-lang/rust-by-example#1225)
- Rename variable names for consistent in iter_result.md (rust-lang/rust-by-example#1224)
- Fix several shell output and code highlights. (rust-lang/rust-by-example#1222)
- Add new example for Rc. (rust-lang/rust-by-example#1223)

## edition-guide

5 commits in f6c8b92d4e63edd28e862be952f33861f35956f8..e58bc4ca104e890ac56af846877c874c432a64b5
2019-07-06 22:10:32 +0200 to 2019-07-31 20:14:12 +0200
- Hide extraneous `use` in anonymous lifetime example. (rust-lang-nursery/edition-guide#190)
- Attempt to clarify "no more mod.rs". (rust-lang-nursery/edition-guide#187)
- Remove -preview for rustup components. (rust-lang-nursery/edition-guide#188)
- rust-lang-nursery/edition-guide#184 More clear explanation and Title. (rust-lang-nursery/edition-guide#185)
- More clear table headers (rust-lang-nursery/edition-guide#186)

## embedded-book

2 commits in ff334e74fdb9f197e621efa6d7c3105be892e888..c5da1e11915d3f28266168baaf55822f7e3fe999
2019-07-16 13:47:34 +0000 to 2019-08-05 23:02:10 +0000
- install/verify: fix next section link  (rust-embedded/book#202)
- Syst small fix  (rust-embedded/book#198)
2019-08-08 07:35:38 +02:00
Mazdak Farrokhzad
433473ace7
Rollup merge of #63334 - mark-i-m:fix-guide, r=ehuss
Update to rustc-guide that passes toolstate

r? @ehuss

Sorry for the trouble. I've been somewhat hard to reach lately. Thanks for your help!
2019-08-08 07:35:36 +02:00
Mazdak Farrokhzad
4f415fca37
Rollup merge of #63331 - gorup:conditionalinit, r=cramertj
Test conditional initialization validation in async fns

r? @cramertj

Per [paper doc](https://paper.dropbox.com/doc/async.await-Call-for-Tests--AiWF2Nt8tgDiA70qFI~oiLOOAg-nMyZGrra7dz9KcFRMLKJy) calling for async/.await tests, tests are desired for conditionally initialized local variables. This PR hopes to provide tests for that.

#63294 seems to be tracking the items from the paper doc that this PR is related to
#62121 is an open issue asking for more async/.await tests that this relates to

---
👍 executed 2 new tests
👍 tidy
2019-08-08 07:35:35 +02:00
Mazdak Farrokhzad
ab9a95b91b
Rollup merge of #63327 - lzutao:fix-as_raw_stat-dep-msg, r=Mark-Simulacrum
doc: Reword deprecation message of MetadataExt::as_raw_stat

Closes #62711
r? @Mark-Simulacrum
2019-08-08 07:35:33 +02:00
Mazdak Farrokhzad
5277c71e84
Rollup merge of #63259 - JohnTitor:add-tests-for-some-issues, r=Centril
Add tests for some issues

Closes #29265
Closes #37433
Closes #49544

r? @Centril
2019-08-08 07:35:32 +02:00
Mazdak Farrokhzad
3a84c9db5f
Rollup merge of #62994 - iluuu1994:test-for-43398, r=nikomatsakis
Add test for #43398

Closes #43398
2019-08-08 07:35:30 +02:00
bors
04523404bc Auto merge of #63282 - Xanewok:update-rls, r=nikomatsakis
Update RLS

Most importantly this includes:
* Collect file -> edition mapping after AST expansion ([#1513](https://github.com/rust-lang/rls/pull/1513)) (enabled by https://github.com/rust-lang/rust/pull/62679)
* Fix rustfmt during builds by reading edition from manifest ([#1533](https://github.com/rust-lang/rls/pull/1533))

Which fixes the annoying problem where users couldn't format via RLS while `cargo fmt` worked.

The beta cut-off is drawing near and I'd like to make sure this lands before then.
2019-08-08 05:28:07 +00:00
Yuki Okushi
e2b3543eab Return early to avoid failing assertion 2019-08-08 13:38:23 +09:00
Lzu Tao
9163990702 doc: Fix typo in float from bytes methods 2019-08-08 01:53:30 +00:00
bors
db7c773a6b Auto merge of #63363 - ehuss:update-cargo, r=alexcrichton
Update cargo

9 commits in 26092da337b948719549cd5ed3d1051fd847afd7..42a8c0adf91323c01228268c651aef5366b25b69
2019-07-31 23:24:32 +0000 to 2019-08-07 20:41:07 +0000
- Add support for customizing JSON diagnostics from Cargo (rust-lang/cargo#7214)
- Bump rustfix (rust-lang/cargo#7221)
- Fix remap-path-prefix from failing. (rust-lang/cargo#7219)
- Clean up build script stuff and documentation. (rust-lang/cargo#7215)
- Remove debug panic in package-features. (rust-lang/cargo#7213)
- Fix an old test. (rust-lang/cargo#7208)
- Remove unused AstBuilder (rust-lang/cargo#7210)
- Revert "Release a jobserver token while locking a file" (rust-lang/cargo#7201)
- improve error message for unmatched prerelease dependencies (rust-lang/cargo#7191)
2019-08-08 01:48:31 +00:00
Eric Huss
266fa0c26a Update cargo 2019-08-07 17:23:54 -07:00
bors
476af31d59 Auto merge of #62457 - zackmdavis:minimax_search_and_the_structure_of_cognition, r=varkor
pretty-pretty extremal constants!

(A resurrection of the defunct #57073.)

While many programmers may intuitively appreciate the significance of "magic numbers" like −2147483648, Rust is about empowering everyone to build reliable and efficient software! It's a bit more legible to print the constant names (even noisy fully-qualified-paths thereof).

The bit-manipulation methods mirror those in `librustc_mir::hair::pattern::_match::all_constructors`; thanks to the immortal Varkor for guidance.

Resolves #56393.

r? @varkor
2019-08-07 22:07:24 +00:00
Brian Anderson
c03077b23a Use consistent capitalization in -C/-Z help 2019-08-07 14:51:49 -07:00
bors
ad7c55e1fc Auto merge of #60547 - redox-os:redox-unix, r=alexcrichton
redox: convert to target_family unix

This is the second step to supporting rust-lang/rust#60139.

In order to have a smooth transition, there will need to be a change made in liblibc at the same time, switching Redox over to the unix target family. See https://github.com/rust-lang/libc/pull/1332
2019-08-07 16:56:46 +00:00
Eric Huss
7568fbd7fa Update books 2019-08-07 09:44:12 -07:00
bors
647ed20e43 Auto merge of #63280 - lzutao:update-clippy, r=Mark-Simulacrum
submodules: Update clippy

r? @Manishearth
Fixes clippy toolstate in https://github.com/rust-lang/rust/pull/63228#issuecomment-517886963
2019-08-07 13:15:53 +00:00
bors
d4abb08be6 Auto merge of #61919 - alexreg:fix-atb-1, r=nikomatsakis
Fix for "ambiguous associated type" issue with ATBs

Fixes #61752.

r? @nikomatsakis

CC @Centril
2019-08-07 09:33:34 +00:00
Lzu Tao
070eb0c707 submodules: Update clippy 2019-08-07 09:00:43 +00:00
bors
5421d94960 Auto merge of #63152 - estebank:big-array, r=oli-obk
Always error on `SizeOverflow` during mir evaluation

Fix #55878, fix #25116.

r? @oli-obk
2019-08-07 04:28:08 +00:00
Zack M. Davis
d1cdb02e4d pretty-pretty extremal constants!
While many programmers may intuitively appreciate the significance of
"magic numbers" like −2147483648, Rust is about empowering everyone to
build reliable and efficient software! It's a bit more legible to
print the constant names (even noisy fully-qualified-paths thereof).

The bit-manipulation methods mirror those in
`librustc_mir::hair::pattern::_match::all_constructors`; thanks to the
immortal Varkor for guidance.

Resolves #56393.
2019-08-06 21:00:46 -07:00
Jeremy Soller
ebb648d4fb
Fix cfg_if usage 2019-08-06 19:32:39 -06:00
bors
615c46086a Auto merge of #63341 - Centril:rollup-hkhxahb, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #63034 (Fix generator size regressions due to optimization)
 - #63035 (Use MaybeUninit to produce more correct layouts)
 - #63163 (add a pair of whitespace after remove parentheses)
 - #63294 (tests for async/await drop order)
 - #63307 (don't ignore mir_dump folder)
 - #63308 (PlaceRef's base is already a reference)
 - #63310 (Tests around moving parts of structs and tuples across await points)
 - #63314 (doc: the content has since been moved to the guide)
 - #63333 (Remove unnecessary features from compiler error code list)

Failed merges:

r? @ghost
2019-08-07 00:45:00 +00:00
Eric Huss
04eee2eca2 Don't use remap-path-prefix in dep-info files. 2019-08-06 17:39:22 -07:00
Esteban Küber
3144b0aa04 review comment: reword test comment 2019-08-06 16:51:17 -07:00
Ryan Gorup
811c304029 Test conditional initialization validation in async fns 2019-08-06 16:44:12 -07:00
Mazdak Farrokhzad
c8ea26e6ff
Rollup merge of #63333 - jethrogb:jb/error-codes-features, r=Mark-Simulacrum
Remove unnecessary features from compiler error code list
2019-08-07 01:39:38 +02:00
Mazdak Farrokhzad
2c81d606f9
Rollup merge of #63314 - tshepang:update-src-readme, r=matthewjasper
doc: the content has since been moved to the guide
2019-08-07 01:39:36 +02:00
Mazdak Farrokhzad
051f94d588
Rollup merge of #63310 - gorup:partial-moves, r=cramertj
Tests around moving parts of structs and tuples across await points

r? cramertj

Per the [dropbox paper](https://paper.dropbox.com/doc/async.await-Call-for-Tests--AiR3vlp1s_Kw0yzWZ1sWMnaIAQ-nMyZGrra7dz9KcFRMLKJy) about more tests, it appears there are some tests wanted around local variables (under the section ["Dynamic semantics"](https://paper.dropbox.com/doc/async.await-Call-for-Tests--AiR3vlp1s_Kw0yzWZ1sWMnaIAg-nMyZGrra7dz9KcFRMLKJy#:uid=122335511260129643493892&h2=Dynamic-semantics)). Here is one commit, and I can probably get code up for other scenarios listed there, although I may not have the full background to know what is being targeted by the tests. Please assist me if I'm off course, thanks!

---
- Executed all 4 new tests
- Executed `tidy` command
2019-08-07 01:39:35 +02:00
Mazdak Farrokhzad
f635ce590d
Rollup merge of #63308 - spastorino:place-ref-base-is-ref, r=oli-obk
PlaceRef's base is already a reference

r? @oli-obk
2019-08-07 01:39:33 +02:00
Mazdak Farrokhzad
3c76ab3e73
Rollup merge of #63307 - RalfJung:gitignore, r=alexcrichton
don't ignore mir_dump folder

I dumped some MIR and wondered why `git status` wouldn't show the tree as dirty, reminding me to clean up after myself. Turns out this folder was explicitly gitignored. I don't think it should be.

If someone doesn't want to clean up that way, they can add it to `.git/info/exclude`.

(That file seems like it could need some general cleanup, honestly, but that's for another day.)
2019-08-07 01:39:32 +02:00
Mazdak Farrokhzad
7860cf4542
Rollup merge of #63294 - alsuren:async-tests, r=cramertj
tests for async/await drop order

This is just me helping out with https://github.com/rust-lang/rust/issues/62121 where I can.

I'm also going to use this as a public place to collect my thoughts about what has already been done and what hasn't (adding comments to the dropbox paper doc was quickly getting spammy).

I've tried to keep my commit messages similar to the line items on https://paper.dropbox.com/doc/async.await-Call-for-Tests--AiKouT0L41mSnK1741s~TiiRAg-nMyZGrra7dz9KcFRMLKJy as possible.

A bunch of my tests are likely to be either redundant with other tests, or lower quality than other tests that people are writing. A reasonable approach might be to tell me which commits you want to keep and I'll throw away the rest of them.

The part from the dropbox paper doc that I'm concentrating on here is:
(items marked with `?` are ones that I can't immediately think of how to test, so I will leave for other people. Items with checkboxes are things that I have done or will try to do next)

### Dynamic semantics
- `async`/`await` with unusual locals:
    - ? partially uninhabited
    - ? conditionally initialized
    - ~drop impls~ already done in src/test/ui/async-await/drop-order/*
    - ? nested drop impls
    - ~partially moved (e.g., `let x = (vec![], vec![]); drop(x.0); foo.await; drop(x.1);`)~ see  https://github.com/rust-lang/rust/pull/63310
- Control flow:
    - basic
    - complex
- [x] `.await` while holding variables of different sizes
- (possibly) drop order
    - [x] including drop order for locals when a future is dropped part-way through execution
         - Parameters' drop order is covered in my commit f40190a
    - ~An async fn version of `dynamic-drop.rs`~
        - already done by matthewjasper in https://github.com/rust-lang/rust/pull/62193/files
- ? interaction with const eval, promoteds, and temporaries
- [x] drop the resulting future and check that local variables and parameters are dropped in the expected order (interaction with cancellation, in other words)
    - also in f40190a

Explanation of commits:

* 0a1bdd4 is the simplest place I could think of to explicitly test `.await` while holding variables of different sizes. I'm pretty sure that this will end up being redundant with something else, so I'm happy to drop it.
* f40190a is a copy-paste from `drop-order-for-async-fn-parameters.rs` with `NeverReady.await` dumped on the end of each testcase.
    * Normally I don't like copy-paste-based tests, but `drop-order-for-async-fn-parameters-by-ref-binding.rs` is also copy-paste, so I thought it might be okay.
    * [x] I'm a bit sad that this doesn't cover non-parameter locals, but I think it should be easy enough to extend in that direction, so I might have a crack at that tomorrow.
* c4940e0f90 makes a bunch of local variables and moves them into either `{}` blocks or `async move {}` blocks, checking for any surprising differences.
    * I have tried to give the test functions descriptive names
    * I have not duplicated the tests for methods with/without self.
    * I think that all of these tests could be rewritten to be clearer if I could write down the expected drop order next to each test.
2019-08-07 01:39:30 +02:00
Mazdak Farrokhzad
fb79a74020
Rollup merge of #63163 - bravomikekilo:master, r=cramertj
add a pair of whitespace after remove parentheses

fix [issue-63156](https://github.com/rust-lang/rust/issues/63156).
add a pair of whitespace after remove parentheses.
2019-08-07 01:39:28 +02:00
Mazdak Farrokhzad
fb1f57e0e5
Rollup merge of #63034 - tmandry:reduce-generator-size-regressions, r=cramertj
Fix generator size regressions due to optimization

I tested the generator optimizations in #60187 and #61922 on the Fuchsia
build, and noticed that some small generators (about 8% of the async fns
in our build) increased in size slightly.

This is because in #60187 we split the fields into two groups, a
"prefix" non-overlap region and an overlap region, and lay them out
separately. This can introduce unnecessary padding bytes between the two
groups.

In every single case in the Fuchsia build, it was due to there being
only a single variant being used in the overlap region. This means that
we aren't doing any overlapping, period. So it's better to combine the
two regions into one and lay out all the fields at once, which is what
this change does.

r? @cramertj
cc @eddyb @Zoxc
2019-08-07 01:39:25 +02:00