Update array queue and linkedlist queue

Author: rongyi

codes/rust/chapter_stack_and_queue/array_queue.rs

@@ -5,18 +5,18 @@
  */
 
 /* 基于环形数组实现的队列 */
-struct ArrayQueue {
-    nums: Vec<i32>,    // 用于存储队列元素的数组
+struct ArrayQueue<T> {
+    nums: Vec<T>,      // 用于存储队列元素的数组
     front: i32,        // 队首指针，指向队首元素
     que_size: i32,     // 队列长度
     que_capacity: i32, // 队列容量
 }
 
-impl ArrayQueue {
+impl<T: Copy + Default> ArrayQueue<T> {
     /* 构造方法 */
-    fn new(capacity: i32) -> ArrayQueue {
+    fn new(capacity: i32) -> ArrayQueue<T> {
         ArrayQueue {
-            nums: vec![0; capacity as usize],
+            nums: vec![T::default(); capacity as usize],
             front: 0,
             que_size: 0,
             que_capacity: capacity,
@@ -39,7 +39,7 @@ impl ArrayQueue {
     }
 
     /* 入队 */
-    fn push(&mut self, num: i32) {
+    fn push(&mut self, num: T) {
         if self.que_size == self.capacity() {
             println!("队列已满");
             return;
@@ -53,7 +53,7 @@ impl ArrayQueue {
     }
 
     /* 出队 */
-    fn pop(&mut self) -> i32 {
+    fn pop(&mut self) -> T {
         let num = self.peek();
         // 队首指针向后移动一位，若越过尾部，则返回到数组头部
         self.front = (self.front + 1) % self.que_capacity;
@@ -62,18 +62,18 @@ impl ArrayQueue {
     }
 
     /* 访问队首元素 */
-    fn peek(&self) -> i32 {
+    fn peek(&self) -> T {
         if self.is_empty() {
             panic!("index out of bounds");
         }
         self.nums[self.front as usize]
     }
 
     /* 返回数组 */
-    fn to_vector(&self) -> Vec<i32> {
+    fn to_vector(&self) -> Vec<T> {
         let cap = self.que_capacity;
         let mut j = self.front;
-        let mut arr = vec![0; self.que_size as usize];
+        let mut arr = vec![T::default(); cap as usize];
         for i in 0..self.que_size {
             arr[i as usize] = self.nums[(j % cap) as usize];
             j += 1;

codes/rust/chapter_stack_and_queue/linkedlist_queue.rs

@@ -33,7 +33,7 @@ impl<T: Copy> LinkedListQueue<T> {
 
     /* 判断队列是否为空 */
     pub fn is_empty(&self) -> bool {
-        return self.size() == 0;
+        return self.que_size == 0;
     }
 
     /* 入队 */