Polish rust

Author: rongyi

codes/rust/chapter_array_and_linkedlist/my_list.rs

@@ -90,7 +90,7 @@ impl MyList {
             panic!("索引越界")
         };
         let num = self.arr[index];
-        // 将将索引 index 之后的元素都向前移动一位
+        // 将索引 index 之后的元素都向前移动一位
         for j in index..self.size - 1 {
             self.arr[j] = self.arr[j + 1];
         }

codes/rust/chapter_heap/heap.rs

@@ -13,22 +13,12 @@ fn test_push_max(heap: &mut BinaryHeap<i32>, val: i32) {
     println!("\n元素 {} 入堆后", val);
     print_util::print_heap(heap.iter().map(|&val| val).collect());
 }
-fn test_push_min(heap: &mut BinaryHeap<Reverse<i32>>, val: i32) {
-    heap.push(Reverse(val)); // 元素入堆
-    println!("\n元素 {} 入堆后", val);
-    print_util::print_heap(heap.iter().map(|&val| val.0).collect());
-}
 
 fn test_pop_max(heap: &mut BinaryHeap<i32>) {
     let val = heap.pop().unwrap();
     println!("\n堆顶元素 {} 出堆后", val);
     print_util::print_heap(heap.iter().map(|&val| val).collect());
 }
-fn test_pop_min(heap: &mut BinaryHeap<Reverse<i32>>) {
-    let val = heap.pop().unwrap().0;
-    println!("\n堆顶元素 {} 出堆后", val);
-    print_util::print_heap(heap.iter().map(|&val| val.0).collect());
-}
 
 /* Driver Code */
 fn main() {

codes/rust/chapter_stack_and_queue/linkedlist_stack.rs

@@ -58,13 +58,17 @@ impl<T: Copy> LinkedListStack<T> {
     }
 
     /* 将 List 转化为 Array 并返回 */
-    pub fn to_array(&self, head: Option<&Rc<RefCell<ListNode<T>>>>) -> Vec<T> {
-        if let Some(node) = head {
-            let mut nums = self.to_array(node.borrow().next.as_ref());
-            nums.push(node.borrow().val);
-            return nums;
+    pub fn to_array(&self) -> Vec<T> {
+        fn _to_array<T: Sized + Copy>(head: Option<&Rc<RefCell<ListNode<T>>>>) -> Vec<T> {
+            if let Some(node) = head {
+                let mut nums = _to_array(node.borrow().next.as_ref());
+                nums.push(node.borrow().val);
+                return nums;
+            }
+            return Vec::new();
         }
-        return Vec::new();
+
+        _to_array(self.peek())
     }
 }
 
@@ -80,7 +84,7 @@ fn main() {
     stack.push(5);
     stack.push(4);
     print!("栈 stack = ");
-    print_util::print_array(&stack.to_array(stack.peek()));
+    print_util::print_array(&stack.to_array());
 
     /* 访问栈顶元素 */
     let peek = stack.peek().unwrap().borrow().val;
@@ -89,7 +93,7 @@ fn main() {
     /* 元素出栈 */
     let pop = stack.pop().unwrap();
     print!("\n出栈元素 pop = {}，出栈后 stack = ", pop);
-    print_util::print_array(&stack.to_array(stack.peek()));
+    print_util::print_array(&stack.to_array());
 
     /* 获取栈的长度 */
     let size = stack.size();

codes/rust/src/include/tree_node.rs

@@ -34,7 +34,7 @@ impl TreeNode {
 macro_rules! op_vec {
     ( $( $x:expr ),* ) => {
         vec![
-            $( Option::from($x).map(|x| x) ),*
+            $(Option::from($x)),*
         ]
     };
 }