Skip to content

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 19 commits February 28, 2020 22:54
miri engine: turn some debug_assert into assert

@eddyb said to avoid debug assertions in rustc. These checks here look like they are probably not too expensive. Cc @oli-obk
Remove `usable_size` APIs

This removes the usable size APIs:
- remove `usable_size` (obv)
- change return type of allocating methods to include the allocated size
- remove `_excess` API

r? @Amanieu
closes rust-lang/wg-allocators#17
…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
…Mark-Simulacrum

Toolstate: don't duplicate nightly tool list.

Just some cleanup, seems good to avoid duplicating this list.
…nto_diagnostic-leak, r=Centril

Fix a leak in `DiagnosticBuilder::into_diagnostic`.

Fixes rust-lang#69600.

r? @Centril
…ecstatic-morse

Don't convert Results to Options just for matching.
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+ rollup=never p=9

@bors
Copy link
Collaborator

bors commented Mar 3, 2020

📌 Commit 284cd89 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 3, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Mar 3, 2020
@bors
Copy link
Collaborator

bors commented Mar 3, 2020

⌛ Testing commit 284cd89 with merge bf320fe...

bors added a commit that referenced this pull request Mar 3, 2020
Rollup of 9 pull requests

Successful merges:

 - #69565 (miri engine: turn some debug_assert into assert)
 - #69609 (Remove `usable_size` APIs)
 - #69620 (doc(librustc_error_codes): add long error explanation for E0719)
 - #69626 (Toolstate: don't duplicate nightly tool list.)
 - #69628 (Fix a leak in `DiagnosticBuilder::into_diagnostic`.)
 - #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
@bors
Copy link
Collaborator

bors commented Mar 3, 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 3, 2020
@JohnTitor
Copy link
Member

Likely #69609 breaks #69641's test so shouldn't be rollup-ed at the same time, I think, closing.

@JohnTitor JohnTitor closed this Mar 3, 2020
@JohnTitor JohnTitor mentioned this pull request Mar 3, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-0mlvtin branch March 3, 2020 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.