说明:

1. week 91
2. 调整结构, 清理不必要文件
3. 简单修复macro tree不能识别负数的bug
4. 升级rust版本
5. 去处所有unsafe代码
6. tree结构加debug方便定位问题

Author: hxzhao527

.github/workflows/CICD.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Rust
         run: |
-          rustup toolchain add ${{ matrix.toolchain }} --component llvm-tools-preview
+          rustup toolchain add ${{ matrix.toolchain }} --component llvm-tools
           rustup override set ${{ matrix.toolchain }}
       - name: Configure cache
         uses: actions/cache@v2
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Setup Rust
         run: |
-          rustup toolchain add nightly --component llvm-tools-preview
+          rustup toolchain add nightly --component llvm-tools
           rustup override set nightly
           cargo install grcov
       - name: Configure cache

.vscode/settings.json

@@ -5,10 +5,6 @@
     "rust-analyzer.debug.engine": "vadimcn.vscode-lldb",
     "rust-analyzer.debug.openDebugPane": true,
     "rust-analyzer.inlayHints.typeHints.hideNamedConstructor": true,
-    // "rust-analyzer.server.path": "~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rust-analyzer",
-    "rust-analyzer.runnableEnv": {
-        "RUST_BACKTRACE": "0"
-    },
     "coverage-gutters.coverageBaseDir": "target/coverage",
     "coverage-gutters.coverageFileNames": [
         "lcov.info",

.vscode/tasks.json

@@ -1,4 +1,4 @@
-.PHONY: clean coverage
+.PHONY: clean test coverage lint
 
 clean:
 	@cargo clean

Makefile

@@ -1,10 +1,102 @@
 
 use std::cell::RefCell;
+use std::fmt::{Display, Debug};
 use std::rc::Rc;
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Eq)]
 pub struct TreeNode {
     pub val: i32,
     pub left: Option<Rc<RefCell<TreeNode>>>,
     pub right: Option<Rc<RefCell<TreeNode>>>,
+}
+
+impl PartialEq for TreeNode {
+    fn eq(&self, other: &Self) -> bool {
+        if self.val != other.val {
+            return false;
+        }
+
+        match (&self.left, &other.left) {
+            (None, None) => {}
+            (Some(_), None) => return false,
+            (None, Some(_)) => return false,
+            (Some(l), Some(r)) => {
+                if !l.borrow().eq(&r.borrow()) {
+                    return false;
+                }
+            }
+        }
+        match (&self.right, &other.right) {
+            (None, None) => {}
+            (Some(_), None) => return false,
+            (None, Some(_)) => return false,
+            (Some(l), Some(r)) => {
+                if !l.borrow().eq(&r.borrow()) {
+                    return false;
+                }
+            }
+        }
+        true
+    }
+}
+
+impl Display for TreeNode{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.display(f, 0)
+    }
+}
+
+impl TreeNode{
+    fn display(&self, f: &mut std::fmt::Formatter<'_>, depth: usize) -> std::fmt::Result {
+        let mut ret = String::new();
+        if depth > 0 {
+            for _ in 0..depth-1 {
+                ret.push_str("│  ");
+            }
+            ret.push_str("├─ ");
+        }
+        ret.push_str(&self.val.to_string());
+        ret.push_str("\n");
+        write!(f, "{}", ret)?;
+        if let Some(left) = &self.left {
+            left.borrow().display(f, depth+1)?;
+        }
+        if let Some(right) = &self.right {
+            right.borrow().display(f, depth+1)?;
+        }
+        Ok(())
+    }
+}
+
+impl Debug for TreeNode {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.display(f, 0)
+    }
+}
+
+#[cfg(test)]
+mod test{
+    use super::*;
+
+    #[test]
+    fn test_tree_display(){
+        let root = Rc::new(RefCell::new(TreeNode{
+            val: 1,
+            left: Some(Rc::new(RefCell::new(TreeNode{
+                val: 2,
+                left: Some(Rc::new(RefCell::new(TreeNode{
+                    val: 4,
+                    left: None,
+                    right: None,
+                }))),
+                right: None,
+            }))),
+            right: Some(Rc::new(RefCell::new(TreeNode{
+                val: 3,
+                left: None,
+                right: None,
+            }))),
+        }));
+        println!("{}", root.borrow());
+    }
 }

datastructure/src/tree.rs

@@ -1,7 +1,7 @@
 //! 树/链表题, 除了题目自身难受, 构建测试用例也是难事
 //! `Rc` `RefCell` `Box` 反复写, 人都麻了.
 //!
-//! 所以正这个 proc_macro, 自己定义一套 dsl, 至少方便一下测试用例.
+//! 所以整这个 proc_macro, 自己定义一套 dsl, 至少方便一下测试用例.
 //!
 use proc_macro::TokenStream;
 

macros/src/lib.rs

@@ -66,6 +66,7 @@ impl From<TokenStream> for TreeNode {
     fn from(stream: TokenStream) -> Self {
         let mut tree_node = TreeNode::default();
         let mut which_node = WhichNode::S;
+        let mut negtive = false;
 
         for tree in stream.into_iter() {
             match tree {
@@ -88,10 +89,19 @@ impl From<TokenStream> for TreeNode {
                         which_node = WhichNode::R;
                     }
                 }
-                TokenTree::Punct(_punct) => {}
+                TokenTree::Punct(_punct) => {
+                    if _punct.to_string().eq("-") {
+                        negtive = true;
+                    }
+                }
                 TokenTree::Literal(literal) => {
                     let lit = literal.to_string().parse().unwrap();
-                    tree_node.val = lit;
+                    if negtive {
+                        tree_node.val = 0-lit;
+                        negtive = false;
+                    } else {
+                        tree_node.val = lit;
+                    }
                 }
             }
         }
@@ -104,7 +114,7 @@ mod test {
     use super::*;
     #[test]
     fn test_x() {
-        let ts = TokenStream::from_str("{1, right:{2, left: {3}}}").unwrap();
+        let ts = TokenStream::from_str("{1, right:{2, left: {-3}}}").unwrap();
         let tree = tree(ts);
         dbg!(tree);
     }

macros/src/tree_impl.rs

@@ -1,3 +1,3 @@
 [toolchain]
 channel = "nightly"
-components = [ "llvm-tools-preview", "rust-analyzer"]
+components = [ "llvm-tools", ]

rust-toolchain.toml

@@ -1,17 +1,21 @@
-pub mod rotate;
+//! 数组相关的扩展算法
+//! 
+//! 1. 旋转数组 [rotate]
+//! 2. 随机算法 [random]
+//! 3. 快速排序 [quick]
+//! 4. KMP算法 [kmp]
+//! 5. 数学相关 [math]
+//! 6. 拓扑排序 [topological]
+//! 7. 字典树 [trie]
+//! 8. 并查集 [disjoint]
+//! 9. 有序集合 [order_set]
 
+pub mod rotate;
 pub mod random;
-
 pub mod quick;
-
 pub mod kmp;
-
 pub mod math;
-
-// 拓扑排序
 pub mod topological;
-
 pub mod trie;
-
 pub mod disjoint;
 pub mod order_set;

src/array/ext.rs

@@ -8,6 +8,11 @@
 //! * 简单
 //! * 中等
 //!     * [547. 省份数量](find_circle_num)
+//!     * [684. 冗余连接](find_redundant_connection)
+//!     * [990. 等式方程的可满足性](equations_possible)
+//!     * [841. 钥匙和房间](can_visit_all_rooms)
+//! * 困难
+//!     * [839. 相似字符串组](num_similar_groups)
 //!
 
 struct UnionFind {

src/array/ext/disjoint.rs

@@ -1 +1,3 @@
-
+//! KMP
+//! 
+//! 暂时没有

src/array/ext/kmp.rs

@@ -4,10 +4,20 @@
 //! * 简单
 //!     * [1470. 重新排列数组](shuffle)
 //!     * [1582. 二进制矩阵中的特殊位置](num_special)
+//!     * [412. Fizz Buzz](fizz_buzz)
+//!     * [1342. 将数字变成 0 的操作次数](number_of_steps)
+//!     * [836. 矩形重叠](is_rectangle_overlap)
+//!     * [867. 转置矩阵](transpose)
 //! * 中等
 //!     * [462. 最小操作次数使数组元素相等 II](min_moves2)
 //!     * [667. 优美的排列 II](construct_array)
 //!     * [1759. 统计同构子字符串的数目](count_homogenous)
+//!     * [835. 图像重叠](largest_overlap)
+//!     * [840. 矩阵中的幻方](num_magic_squares_inside)
+//!     * [858. 镜面反射](mirror_reflection)
+//! * 困难
+//!     * [829. 连续整数求和](consecutive_numbers_sum)
+//!     * [828. 统计子串中的唯一字符](unique_letter_string)
 
 /// [462. 最少移动次数使数组元素相等 II](https://leetcode.cn/problems/minimum-moves-to-equal-array-elements-ii/)
 ///
@@ -489,11 +499,48 @@ fn lcm(a: i32, b: i32) -> i32 {
     a * b / gcd(a, b)
 }
 
+/// [867. 转置矩阵](https://leetcode.cn/problems/transpose-matrix/)
+pub fn transpose(matrix: Vec<Vec<i32>>) -> Vec<Vec<i32>> {
+    let (m, n) = (matrix.len(), matrix.first().unwrap().len());
+    let mut ret = vec![vec![0; m]; n];
+    for i in 0..m {
+        for j in 0..n {
+            ret[j][i] = matrix[i][j];
+        }
+    }
+    return ret;
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::vec2;
 
+    #[test]
+    fn test_transpose() {
+        struct TestCase {
+            matrix: Vec<Vec<i32>>,
+            expect: Vec<Vec<i32>>,
+        }
+
+        vec![
+            TestCase {
+                matrix: vec2![[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+                expect: vec2![[1, 4, 7], [2, 5, 8], [3, 6, 9]],
+            },
+            TestCase {
+                matrix: vec2![[1, 2, 3], [4, 5, 6]],
+                expect: vec2![[1, 4], [2, 5], [3, 6]],
+            },
+        ]
+        .into_iter()
+        .enumerate()
+        .for_each(|(idx, TestCase { matrix, expect })| {
+            let actual = transpose(matrix);
+            assert_eq!(expect, actual, "case {} failed", idx);
+        });
+    }
+
     #[test]
     #[rustfmt::skip]
     fn test_count_homogenous() {