Skip to content

Remove Drop for ArrayDeque and implement Copy #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove Drop for ArrayDeque and implement Copy #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 3 additions & 45 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,12 +2071,6 @@ where
}
}

impl<T, const CAP: usize, B: Behavior> Drop for ArrayDeque<T, CAP, B> {
fn drop(&mut self) {
self.clear();
}
}

impl<T, const CAP: usize, B: Behavior> Default for ArrayDeque<T, CAP, B> {
#[inline]
fn default() -> Self {
Expand Down Expand Up @@ -2449,6 +2443,9 @@ impl<'a, T, const CAP: usize, B: Behavior> DoubleEndedIterator for Drain<'a, T,

impl<'a, T, const CAP: usize, B: Behavior> ExactSizeIterator for Drain<'a, T, CAP, B> {}

impl<T, const CAP: usize> Copy for ArrayDeque<T, CAP, Saturating> where T: Copy {}
impl<T, const CAP: usize> Copy for ArrayDeque<T, CAP, Wrapping> where T: Copy {}

#[cfg(test)]
mod tests {
#![allow(unused_must_use)]
Expand Down Expand Up @@ -2693,45 +2690,6 @@ mod tests {
}
}

#[test]
fn test_drop() {
use std::cell::Cell;

let flag = &Cell::new(0);

struct Bump<'a>(&'a Cell<i32>);

impl<'a> Drop for Bump<'a> {
fn drop(&mut self) {
let n = self.0.get();
self.0.set(n + 1);
}
}

{
let mut tester = ArrayDeque::<Bump, 128>::new();
tester.push_back(Bump(flag));
tester.push_back(Bump(flag));
}
assert_eq!(flag.get(), 2);

// test something with the nullable pointer optimization
flag.set(0);
{
let mut tester = ArrayDeque::<_, 3>::new();
tester.push_back(vec![Bump(flag)]);
tester.push_back(vec![Bump(flag), Bump(flag)]);
tester.push_back(vec![]);
tester.push_back(vec![Bump(flag)]);
assert_eq!(flag.get(), 1);
drop(tester.pop_back());
assert_eq!(flag.get(), 1);
drop(tester.pop_back());
assert_eq!(flag.get(), 3);
}
assert_eq!(flag.get(), 4);
}

#[test]
fn test_as_slice() {
const CAP: usize = 10;
Expand Down