diff options
| author | bors <bors@rust-lang.org> | 2020-03-07 08:07:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-07 08:07:10 +0000 |
| commit | a03921701cdfe0b2c5422240f3ae370ab21069f1 (patch) | |
| tree | 7388f999dff88403fe5f26f7b9e89ac7bf4b2f04 /src/liballoc | |
| parent | 2890b37b861247de3b8c6ba2ecbcd00048c728a1 (diff) | |
| parent | 709325af672a5513fb70d31b882784f698a195b7 (diff) | |
Auto merge of #69796 - Centril:rollup-xg85jmx, r=Centril
Rollup of 9 pull requests Successful merges: - #67741 (When encountering an Item in a pat context, point at the item def) - #68985 (Parse & reject postfix operators after casts) - #69656 (Use .next() instead of .nth(0) on iterators.) - #69680 (rustc_expand: Factor out `Annotatable::into_tokens` to a separate method) - #69690 (test(pattern): add tests for combinations of pattern features) - #69706 (Use subslice patterns in slice methods) - #69727 (Avoid using `unwrap()` in suggestions) - #69754 (Update deprecation version to 1.42 for Error::description) - #69782 (Don't redundantly repeat field names (clippy::redundant_field_names)) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/linked_list.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs index a9b4e3e4706..8efacf108fc 100644 --- a/src/liballoc/collections/linked_list.rs +++ b/src/liballoc/collections/linked_list.rs @@ -959,7 +959,7 @@ impl<T> LinkedList<T> { let it = self.head; let old_len = self.len; - DrainFilter { list: self, it: it, pred: filter, idx: 0, old_len: old_len } + DrainFilter { list: self, it, pred: filter, idx: 0, old_len } } } diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 3fd7be06fd4..7523d9c5ba3 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1659,7 +1659,7 @@ struct SetLenOnDrop<'a> { impl<'a> SetLenOnDrop<'a> { #[inline] fn new(len: &'a mut usize) -> Self { - SetLenOnDrop { local_len: *len, len: len } + SetLenOnDrop { local_len: *len, len } } #[inline] |
