@@ -390,10 +390,10 @@ where
390
390
/// *find += 1000;
391
391
/// find.finish();
392
392
///
393
- /// assert_eq!(ll.pop(), Ok (1002));
394
- /// assert_eq!(ll.pop(), Ok (3));
395
- /// assert_eq!(ll.pop(), Ok (1));
396
- /// assert_eq!(ll.pop(), Err(()) );
393
+ /// assert_eq!(ll.pop(), Some (1002));
394
+ /// assert_eq!(ll.pop(), Some (3));
395
+ /// assert_eq!(ll.pop(), Some (1));
396
+ /// assert_eq!(ll.pop(), None );
397
397
/// ```
398
398
pub fn find_mut < F > ( & mut self , mut f : F ) -> Option < FindMutInner < ' _ , T , Idx , K , S > >
399
399
where
@@ -491,16 +491,15 @@ where
491
491
/// ll.push(1).unwrap();
492
492
/// ll.push(2).unwrap();
493
493
///
494
- /// assert_eq!(ll.pop(), Ok (2));
495
- /// assert_eq!(ll.pop(), Ok (1));
496
- /// assert_eq!(ll.pop(), Err(()) );
494
+ /// assert_eq!(ll.pop(), Some (2));
495
+ /// assert_eq!(ll.pop(), Some (1));
496
+ /// assert_eq!(ll.pop(), None );
497
497
/// ```
498
- #[ allow( clippy:: result_unit_err) ]
499
- pub fn pop ( & mut self ) -> Result < T , ( ) > {
498
+ pub fn pop ( & mut self ) -> Option < T > {
500
499
if !self . is_empty ( ) {
501
- Ok ( unsafe { self . pop_unchecked ( ) } )
500
+ Some ( unsafe { self . pop_unchecked ( ) } )
502
501
} else {
503
- Err ( ( ) )
502
+ None
504
503
}
505
504
}
506
505
@@ -652,9 +651,9 @@ where
652
651
/// let mut find = ll.find_mut(|v| *v == 2).unwrap();
653
652
/// find.pop();
654
653
///
655
- /// assert_eq!(ll.pop(), Ok (3));
656
- /// assert_eq!(ll.pop(), Ok (1));
657
- /// assert_eq!(ll.pop(), Err(()) );
654
+ /// assert_eq!(ll.pop(), Some (3));
655
+ /// assert_eq!(ll.pop(), Some (1));
656
+ /// assert_eq!(ll.pop(), None );
658
657
/// ```
659
658
#[ inline]
660
659
pub fn pop ( mut self ) -> T {
@@ -685,10 +684,10 @@ where
685
684
/// *find += 1000;
686
685
/// find.finish(); // Will resort, we accessed (and updated) the value.
687
686
///
688
- /// assert_eq!(ll.pop(), Ok (1002));
689
- /// assert_eq!(ll.pop(), Ok (3));
690
- /// assert_eq!(ll.pop(), Ok (1));
691
- /// assert_eq!(ll.pop(), Err(()) );
687
+ /// assert_eq!(ll.pop(), Some (1002));
688
+ /// assert_eq!(ll.pop(), Some (3));
689
+ /// assert_eq!(ll.pop(), Some (1));
690
+ /// assert_eq!(ll.pop(), None );
692
691
/// ```
693
692
#[ inline]
694
693
pub fn finish ( self ) {
0 commit comments