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.

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

Rollup of 8 pull requests #60949

Merged
merged 19 commits into from
May 19, 2019
Merged

Rollup of 8 pull requests #60949

merged 19 commits into from
May 19, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 19, 2019

Successful merges:

Failed merges:

r? @ghost

DutchGhost and others added 19 commits May 9, 2019 20:30
These `into_iter()` calls will change from iterating references to
values if we ever get `IntoIterator` for arrays, which may break the
code using that iterator. Calling `iter()` is future proof.
…, r=sfackler

Mark core::alloc::Layout::from_size_align_unchecked const

Makes it possible (pending stabilization of rust-lang#57563 (`const_fn`)) to rewrite code like

```rust
const BUFFER_SIZE: usize = 0x2000;
const BUFFER_ALIGN: usize = 0x1000;

fn foo() {
  let layout = std::alloc::Layout::from_size_align(BUFFER_SIZE, BUFFER_ALIGN)
    .unwrap();
  let buffer = std::alloc::alloc(layout);
}
```
to
```rust
const BUFFER_LAYOUT: std::alloc::Layout = unsafe {
  std::alloc::Layout::from_size_align_unchecked(0x2000, 0x1000)
};

fn foo() {
  let buffer = std::alloc::alloc(BUFFER_LAYOUT);
}
```

which (although `unsafe` is used) looks somewhat cleaner and is easier to read.
Stabilize vecdeque_rotate

This PR stabilizes the vecdeque_rotate feature.
r? @scottmcm

Closes rust-lang#56686
Explain that ? converts the error type using From

Fix rust-lang#60917.
Use iter() for iterating arrays by slice

These `into_iter()` calls will change from iterating references to
values if we ever get `IntoIterator` for arrays, which may break the
code using that iterator. Calling `iter()` is future proof.
…e_macro, r=petrochenkov

Declare DefIndex with the newtype_index macro

See rust-lang#60666
fix copy-paste typo in docs for ptr::read_volatile
…=shepmaster

Simplify BufRead::fill_buf doc example using NLL

With non-lexical lifetimes, in this example it is no longer necessary to use a block to end the borrow early.
…schievink

Fix typos in docs of GlobalAlloc
@Centril
Copy link
Contributor Author

Centril commented May 19, 2019

@bors r+ p=8

@bors
Copy link
Contributor

bors commented May 19, 2019

📌 Commit 9389c69 has been approved by Centril

@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 May 19, 2019
@Centril
Copy link
Contributor Author

Centril commented May 19, 2019

@bors rollup=never

@bors
Copy link
Contributor

bors commented May 19, 2019

⌛ Testing commit 9389c69 with merge 26ab324...

bors added a commit that referenced this pull request May 19, 2019
Rollup of 8 pull requests

Successful merges:

 - #60370 (Mark core::alloc::Layout::from_size_align_unchecked const)
 - #60678 (Stabilize vecdeque_rotate)
 - #60924 (Explain that ? converts the error type using From)
 - #60931 (Use iter() for iterating arrays by slice)
 - #60934 (Declare DefIndex with the newtype_index macro)
 - #60943 (fix copy-paste typo in docs for ptr::read_volatile)
 - #60945 (Simplify BufRead::fill_buf doc example using NLL)
 - #60947 (Fix typos in docs of GlobalAlloc)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 26ab324 to master...

@bors bors merged commit 9389c69 into rust-lang:master May 19, 2019
@Centril Centril deleted the rollup-f918e1v branch May 19, 2019 05:12
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants