Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

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

diff --git a/vendor/rustc-rayon/src/result.rs b/vendor/rustc-rayon/src/result.rs
index e0a63dbc7f8378ebb024a665cec5a8cefba058fc..43685ca43aa3c0e527887c3838db16a89da84c11 100644 (file)
--- a/vendor/rustc-rayon/src/result.rs
+++ b/vendor/rustc-rayon/src/result.rs
@@ -5,11 +5,11 @@
 //!
 //! [std::result]: https://doc.rust-lang.org/stable/std/result/
 
-use iter::plumbing::*;
-use iter::*;
+use crate::iter::plumbing::*;
+use crate::iter::*;
 use std::sync::Mutex;
 
-use option;
+use crate::option;
 
 /// Parallel iterator over a result
 #[derive(Debug, Clone)]
@@ -35,7 +35,7 @@ delegate_indexed_iterator! {
 
 /// Parallel iterator over an immutable reference to a result
 #[derive(Debug)]
-pub struct Iter<'a, T: Sync + 'a> {
+pub struct Iter<'a, T: Sync> {
     inner: option::IntoIter<&'a T>,
 }
 
@@ -65,7 +65,7 @@ delegate_indexed_iterator! {
 
 /// Parallel iterator over a mutable reference to a result
 #[derive(Debug)]
-pub struct IterMut<'a, T: Send + 'a> {
+pub struct IterMut<'a, T: Send> {
     inner: option::IntoIter<&'a mut T>,
 }