Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 853f300

Browse files
committedJul 5, 2019
Auto merge of #62407 - Centril:rollup-g0zmff7, r=Centril
Rollup of 10 pull requests Successful merges: - #62123 ( Remove needless lifetimes (std)) - #62150 (Implement mem::{zeroed,uninitialized} in terms of MaybeUninit.) - #62169 (Derive which queries to save using the proc macro) - #62238 (Fix code block information icon position) - #62292 (Move `async || ...` closures into `#![feature(async_closure)]`) - #62323 (Clarify unaligned fields in ptr::{read,write}_unaligned) - #62324 (Reduce reliance on `await!(...)` macro) - #62371 (Add tracking issue for Box::into_pin) - #62383 (Improve error span for async type inference error) - #62388 (Break out of the correct number of scopes in loops) Failed merges: r? @ghost
2 parents f119bf2 + 1808189 commit 853f300

File tree

77 files changed

+496
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+496
-281
lines changed
 

‎src/liballoc/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ impl<T: ?Sized> Box<T> {
320320
/// This conversion does not allocate on the heap and happens in place.
321321
///
322322
/// This is also available via [`From`].
323-
#[unstable(feature = "box_into_pin", issue = "0")]
323+
#[unstable(feature = "box_into_pin", issue = "62370")]
324324
pub fn into_pin(boxed: Box<T>) -> Pin<Box<T>> {
325325
// It's not possible to move or replace the insides of a `Pin<Box<T>>`
326326
// when `T: !Unpin`, so it's safe to pin it directly without any

‎src/liballoc/collections/btree/map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ impl<K, V> BTreeMap<K, V> {
20322032
/// assert_eq!(keys, [1, 2]);
20332033
/// ```
20342034
#[stable(feature = "rust1", since = "1.0.0")]
2035-
pub fn keys<'a>(&'a self) -> Keys<'a, K, V> {
2035+
pub fn keys(&self) -> Keys<'_, K, V> {
20362036
Keys { inner: self.iter() }
20372037
}
20382038

@@ -2053,7 +2053,7 @@ impl<K, V> BTreeMap<K, V> {
20532053
/// assert_eq!(values, ["hello", "goodbye"]);
20542054
/// ```
20552055
#[stable(feature = "rust1", since = "1.0.0")]
2056-
pub fn values<'a>(&'a self) -> Values<'a, K, V> {
2056+
pub fn values(&self) -> Values<'_, K, V> {
20572057
Values { inner: self.iter() }
20582058
}
20592059

@@ -2557,8 +2557,8 @@ enum UnderflowResult<'a, K, V> {
25572557
Stole(NodeRef<marker::Mut<'a>, K, V, marker::Internal>),
25582558
}
25592559

2560-
fn handle_underfull_node<'a, K, V>(node: NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal>)
2561-
-> UnderflowResult<'a, K, V> {
2560+
fn handle_underfull_node<K, V>(node: NodeRef<marker::Mut<'_>, K, V, marker::LeafOrInternal>)
2561+
-> UnderflowResult<'_, K, V> {
25622562
let parent = if let Ok(parent) = node.ascend() {
25632563
parent
25642564
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.