@@ -208,37 +208,39 @@ impl<L: Link> LinkedList<L, L::Target> {
208208 /// The caller **must** ensure that `node` is currently contained by
209209 /// `self` or not contained by any other list.
210210 pub unsafe fn remove ( & mut self , node : NonNull < L :: Target > ) -> Option < L :: Handle > {
211- if let Some ( prev) = L :: pointers ( node) . as_ref ( ) . get_prev ( ) {
212- debug_assert_eq ! ( L :: pointers( prev) . as_ref( ) . get_next( ) , Some ( node) ) ;
213- L :: pointers ( prev)
214- . as_mut ( )
215- . set_next ( L :: pointers ( node) . as_ref ( ) . get_next ( ) ) ;
216- } else {
217- if self . head != Some ( node) {
218- return None ;
211+ unsafe {
212+ if let Some ( prev) = L :: pointers ( node) . as_ref ( ) . get_prev ( ) {
213+ debug_assert_eq ! ( L :: pointers( prev) . as_ref( ) . get_next( ) , Some ( node) ) ;
214+ L :: pointers ( prev)
215+ . as_mut ( )
216+ . set_next ( L :: pointers ( node) . as_ref ( ) . get_next ( ) ) ;
217+ } else {
218+ if self . head != Some ( node) {
219+ return None ;
220+ }
221+
222+ self . head = L :: pointers ( node) . as_ref ( ) . get_next ( ) ;
219223 }
220224
221- self . head = L :: pointers ( node) . as_ref ( ) . get_next ( ) ;
222- }
225+ if let Some ( next) = L :: pointers ( node) . as_ref ( ) . get_next ( ) {
226+ debug_assert_eq ! ( L :: pointers( next) . as_ref( ) . get_prev( ) , Some ( node) ) ;
227+ L :: pointers ( next)
228+ . as_mut ( )
229+ . set_prev ( L :: pointers ( node) . as_ref ( ) . get_prev ( ) ) ;
230+ } else {
231+ // // This might be the last item in the list
232+ // if self.tail != Some(node) {
233+ // return None;
234+ // }
235+
236+ // self.tail = L::pointers(node).as_ref().get_prev();
237+ }
223238
224- if let Some ( next) = L :: pointers ( node) . as_ref ( ) . get_next ( ) {
225- debug_assert_eq ! ( L :: pointers( next) . as_ref( ) . get_prev( ) , Some ( node) ) ;
226- L :: pointers ( next)
227- . as_mut ( )
228- . set_prev ( L :: pointers ( node) . as_ref ( ) . get_prev ( ) ) ;
229- } else {
230- // // This might be the last item in the list
231- // if self.tail != Some(node) {
232- // return None;
233- // }
239+ L :: pointers ( node) . as_mut ( ) . set_next ( None ) ;
240+ L :: pointers ( node) . as_mut ( ) . set_prev ( None ) ;
234241
235- // self.tail = L::pointers (node).as_ref().get_prev();
242+ Some ( L :: from_raw ( node) )
236243 }
237-
238- L :: pointers ( node) . as_mut ( ) . set_next ( None ) ;
239- L :: pointers ( node) . as_mut ( ) . set_prev ( None ) ;
240-
241- Some ( L :: from_raw ( node) )
242244 }
243245
244246 // pub fn last(&self) -> Option<&L::Target> {
0 commit comments