Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 7 pull requests #69643

Closed
wants to merge 14 commits into from
Closed

Rollup of 7 pull requests #69643

wants to merge 14 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

thekuom and others added 14 commits March 1, 2020 15:17
@thekuom
doc(librustc_error_codes): add long error explanation for E0719
275dac7 
Progresses rust-lang#61137
@matthiaskrgr
use question mark operator in a few places.
a0db435
@XAMPPRocky
Update my mailmap entry
4643b12
@GuillaumeGomez
clean up E0378 explanation
ba49ed0
@matthiaskrgr
Don't convert Results to Options just for matching.
0ec1408
@ehuss
Toolstate: don't duplicate nightly tool list.
fdc14cb
@ehuss
Update books
4281fe0
@Dylan-DPC
Rollup merge of rust-lang#69620 - thekuom:doc/61137-add-long-error-co…
4a2a83f 
…de-e0719, r=davidtwco

doc(librustc_error_codes): add long error explanation for E0719

Reference issue rust-lang#61137

- Updated error_codes.rs
- Added E0719.md in error_codes
- Updated necessary test .stderr files
@Dylan-DPC
Rollup merge of rust-lang#69621 - matthiaskrgr:q, r=petrochenkov
2a3a420 
use question mark operator in a few places.
@Dylan-DPC
Rollup merge of rust-lang#69626 - ehuss:toolstate-nightly-cleanup, r=…
4b00d6f 
…Mark-Simulacrum

Toolstate: don't duplicate nightly tool list.

Just some cleanup, seems good to avoid duplicating this list.
@Dylan-DPC
Rollup merge of rust-lang#69633 - XAMPPRocky:master, r=Dylan-DPC
2dd28f8 
Update my mailmap entry

superceding rust-lang#68891
@Dylan-DPC
Rollup merge of rust-lang#69634 - GuillaumeGomez:clean-up-e0378, r=Dy…
68885ab 
…lan-DPC

clean up E0378 explanation

r? @Dylan-DPC
@Dylan-DPC
Rollup merge of rust-lang#69637 - matthiaskrgr:if_let_some_result, r=…
f9f2b66 
…ecstatic-morse

Don't convert Results to Options just for matching.
@Dylan-DPC
Rollup merge of rust-lang#69641 - ehuss:update-books, r=ehuss
50cfd43 
Update books

## nomicon

7 commits in 3e6e1001dc6e095dbd5c88005e80969f60e384e1..71241f403091e021842ca8275740e44d0ab0ece1
2019-12-14 22:08:52 +0000 to 2020-02-17 17:21:36 +0100
- (minor) Add backticks around type names (rust-lang/nomicon#197)
- Add book.toml (rust-lang/nomicon#185)
- Rename `Alloc` to `AllocRef` (rust-lang/nomicon#188)
- Lifetimes: explain how to fix destructor example (rust-lang/nomicon#195)
- mention soundness (rust-lang/nomicon#194)
- Fix example in FFI section Calling Rust from C (rust-lang/nomicon#193)
- Removed repeated word (rust-lang/nomicon#191)

## reference

8 commits in 64239df..559e09c
2020-02-10 19:05:13 +0100 to 2020-03-02 01:17:14 +0100
- Syntax error fix (rust-lang/reference#769)
- Fix incorrect pseudocode for #[repr(C)] struct alignment (rust-lang/reference#766)
- Replace "Field-Less" with "Fieldless" (rust-lang/reference#768)
- Removed repeated word (rust-lang/reference#767)
- Update for change in const lint name. (rust-lang/reference#764)
- semantic type -> resolved type (rust-lang/reference#761)
- add behavior change of relative paths without `self` in 2018 edition (rust-lang/reference#757)
- assignment operator expressions -> compound assignment expressions (rust-lang/reference#759)

## rust-by-example

3 commits in 32facd5522ddbbf37baf01e4e4b6562bc55c071a..db57f899ea2a56a544c8d280cbf033438666273d
2020-02-11 09:25:06 -0300 to 2020-02-18 17:46:46 -0300
- Minor typo fix in src/mod/visibility (rust-lang/rust-by-example#1309)
- Don't suggest Into implements a reverse conversion (rust-lang/rust-by-example#1307)
- Improve grammar in example of 'in let' section (rust-lang/rust-by-example#1308)

## embedded-book

2 commits in b2e1092bf67bd4d7686c4553f186edbb7f5f92db..b81ffb7a6f4c5aaed92786e770e99db116aa4ebd
2020-01-30 08:45:46 +0000 to 2020-02-27 08:06:04 +0000
- Setting output to `high` needs a `true` argument  (rust-embedded/book#227)
- Add licence notes to index.md  (rust-embedded/book#226)
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Mar 2, 2020

📌 Commit 50cfd43 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 2, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Mar 2, 2020
@bors
Copy link
Contributor

bors commented Mar 2, 2020

⌛ Testing commit 50cfd43 with merge 0d94daa...

bors added a commit that referenced this pull request Mar 2, 2020
@bors
Auto merge of #69643 - Dylan-DPC:rollup-gmt6lm8, r=Dylan-DPC
0d94daa 
Rollup of 7 pull requests

Successful merges:

 - #69620 (doc(librustc_error_codes): add long error explanation for E0719)
 - #69621 (use question mark operator in a few places.)
 - #69626 (Toolstate: don't duplicate nightly tool list.)
 - #69633 (Update my mailmap entry)
 - #69634 (clean up E0378 explanation)
 - #69637 (Don't convert Results to Options just for matching.)
 - #69641 (Update books)

Failed merges:

r? @ghost
@rust-highfive
Copy link
Collaborator

The job arm-android of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2020-03-02T22:57:30.5933082Z   local time: Mon Mar  2 22:57:30 UTC 2020
2020-03-02T22:57:30.8794437Z   network time: Mon, 02 Mar 2020 22:57:30 GMT
2020-03-02T22:57:30.8794907Z == end clock drift check ==
2020-03-02T22:57:31.6743811Z 
2020-03-02T22:57:31.6789303Z ##[error]Bash exited with code '1'.
2020-03-02T22:57:31.6855748Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-02T22:57:31.6860043Z ==============================================================================
2020-03-02T22:57:31.6860351Z Task         : Get sources
2020-03-02T22:57:31.6860650Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 2, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 2, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-gmt6lm8 branch March 3, 2020 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Dylan-DPC-zz @bors @rust-highfive @thekuom @matthiaskrgr @XAMPPRocky @GuillaumeGomez @ehuss @Dylan-DPC