New upstream version 1.52.0~beta.3+dfsg1

[rustc.git] / vendor / rustc-rayon / src / option.rs

diff --git a/vendor/rustc-rayon/src/option.rs b/vendor/rustc-rayon/src/option.rs
index 925107f8291b7c648e1c68a8d31e4e82e9e3e103..0f56896f053707bc14619dc6aad2a9c003982883 100644 (file)
--- a/vendor/rustc-rayon/src/option.rs
+++ b/vendor/rustc-rayon/src/option.rs
@@ -5,9 +5,8 @@
 //!
 //! [std::option]: https://doc.rust-lang.org/stable/std/option/
 
-use iter::plumbing::*;
-use iter::*;
-use std;
+use crate::iter::plumbing::*;
+use crate::iter::*;
 use std::sync::atomic::{AtomicBool, Ordering};
 
 /// A parallel iterator over the value in [`Some`] variant of an [`Option`].
@@ -85,7 +84,7 @@ impl<T: Send> IndexedParallelIterator for IntoIter<T> {
 /// [`Some`]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.Some
 /// [`par_iter`]: ../iter/trait.IntoParallelRefIterator.html#tymethod.par_iter
 #[derive(Debug)]
-pub struct Iter<'a, T: Sync + 'a> {
+pub struct Iter<'a, T: Sync> {
     inner: IntoIter<&'a T>,
 }
 
@@ -123,7 +122,7 @@ delegate_indexed_iterator! {
 /// [`Some`]: https://doc.rust-lang.org/std/option/enum.Option.html#variant.Some
 /// [`par_iter_mut`]: ../iter/trait.IntoParallelRefMutIterator.html#tymethod.par_iter_mut
 #[derive(Debug)]
-pub struct IterMut<'a, T: Send + 'a> {
+pub struct IterMut<'a, T: Send> {
     inner: IntoIter<&'a mut T>,
 }