idomatic structure rust code, no include macro (#1528)

krahets · Oct 23, 2024 · ef3010b · ef3010b
1 parent 0c60037
commit ef3010b
Show file tree

Hide file tree

Showing 47 changed files with 57 additions and 80 deletions.
diff --git a/codes/rust/chapter_array_and_linkedlist/array.rs b/codes/rust/chapter_array_and_linkedlist/array.rs
@@ -4,8 +4,7 @@
  * Author: xBLACICEx ([email protected]), codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::print_util;
 use rand::Rng;
 
 /* 随机访问元素 */

diff --git a/codes/rust/chapter_array_and_linkedlist/linked_list.rs b/codes/rust/chapter_array_and_linkedlist/linked_list.rs
@@ -4,9 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
-use list_node::ListNode;
+use hello_algo_rust::include::{print_util, ListNode};
 use std::cell::RefCell;
 use std::rc::Rc;
 

diff --git a/codes/rust/chapter_array_and_linkedlist/list.rs b/codes/rust/chapter_array_and_linkedlist/list.rs
@@ -3,8 +3,7 @@
  * Created Time: 2023-01-18
  * Author: xBLACICEx ([email protected]), codingonion ([email protected])
  */
-
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* Driver Code */
 fn main() {

diff --git a/codes/rust/chapter_array_and_linkedlist/my_list.rs b/codes/rust/chapter_array_and_linkedlist/my_list.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 列表类 */
 #[allow(dead_code)]

diff --git a/codes/rust/chapter_backtracking/preorder_traversal_i_compact.rs b/codes/rust/chapter_backtracking/preorder_traversal_i_compact.rs
@@ -4,10 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::{print_util, vec_to_tree, TreeNode};
 use std::{cell::RefCell, rc::Rc};
-use tree_node::{vec_to_tree, TreeNode};
 
 /* 前序遍历：例题一 */
 fn pre_order(res: &mut Vec<Rc<RefCell<TreeNode>>>, root: Option<&Rc<RefCell<TreeNode>>>) {

diff --git a/codes/rust/chapter_backtracking/preorder_traversal_ii_compact.rs b/codes/rust/chapter_backtracking/preorder_traversal_ii_compact.rs
@@ -4,10 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::{print_util, vec_to_tree, TreeNode};
 use std::{cell::RefCell, rc::Rc};
-use tree_node::{vec_to_tree, TreeNode};
 
 /* 前序遍历：例题二 */
 fn pre_order(

diff --git a/codes/rust/chapter_backtracking/preorder_traversal_iii_compact.rs b/codes/rust/chapter_backtracking/preorder_traversal_iii_compact.rs
@@ -4,10 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::{print_util, vec_to_tree, TreeNode};
 use std::{cell::RefCell, rc::Rc};
-use tree_node::{vec_to_tree, TreeNode};
 
 /* 前序遍历：例题三 */
 fn pre_order(

diff --git a/codes/rust/chapter_backtracking/preorder_traversal_iii_template.rs b/codes/rust/chapter_backtracking/preorder_traversal_iii_template.rs
@@ -4,10 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::{print_util, vec_to_tree, TreeNode};
 use std::{cell::RefCell, rc::Rc};
-use tree_node::{vec_to_tree, TreeNode};
 
 /* 判断当前状态是否为解 */
 fn is_solution(state: &mut Vec<Rc<RefCell<TreeNode>>>) -> bool {

diff --git a/codes/rust/chapter_computational_complexity/space_complexity.rs b/codes/rust/chapter_computational_complexity/space_complexity.rs
@@ -4,13 +4,10 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
-use list_node::ListNode;
+use hello_algo_rust::include::{print_util, ListNode, TreeNode};
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;
-use tree_node::TreeNode;
 
 /* 函数 */
 fn function() -> i32 {

diff --git a/codes/rust/chapter_computational_complexity/worst_best_time_complexity.rs b/codes/rust/chapter_computational_complexity/worst_best_time_complexity.rs
@@ -4,8 +4,7 @@
  * Author: xBLACICEx ([email protected]), codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::print_util;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 

diff --git a/codes/rust/chapter_divide_and_conquer/build_tree.rs b/codes/rust/chapter_divide_and_conquer/build_tree.rs
@@ -4,10 +4,9 @@
  * Author: codingonion ([email protected])
  */
 
+use hello_algo_rust::include::{print_util, TreeNode};
 use std::collections::HashMap;
 use std::{cell::RefCell, rc::Rc};
-include!("../include/include.rs");
-use tree_node::TreeNode;
 
 /* 构建二叉树：分治 */
 fn dfs(

diff --git a/codes/rust/chapter_graph/graph_adjacency_list.rs b/codes/rust/chapter_graph/graph_adjacency_list.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/vertex.rs");
+pub use hello_algo_rust::include::{vals_to_vets, vets_to_vals, Vertex};
 
 use std::collections::HashMap;
 

diff --git a/codes/rust/chapter_hashing/build_in_hash.rs b/codes/rust/chapter_hashing/build_in_hash.rs
@@ -4,9 +4,8 @@
  * Author: WSL0809 ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::ListNode;
 
-use crate::list_node::ListNode;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
 

diff --git a/codes/rust/chapter_hashing/hash_map.rs b/codes/rust/chapter_hashing/hash_map.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::collections::HashMap;
 

diff --git a/codes/rust/chapter_heap/heap.rs b/codes/rust/chapter_heap/heap.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::collections::BinaryHeap;
 

diff --git a/codes/rust/chapter_heap/my_heap.rs b/codes/rust/chapter_heap/my_heap.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 大顶堆 */
 struct MaxHeap {

diff --git a/codes/rust/chapter_heap/top_k.rs b/codes/rust/chapter_heap/top_k.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::cmp::Reverse;
 use std::collections::BinaryHeap;

diff --git a/codes/rust/chapter_searching/hashing_search.rs b/codes/rust/chapter_searching/hashing_search.rs
@@ -4,9 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
-use list_node::ListNode;
+use hello_algo_rust::include::ListNode;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::rc::Rc;

diff --git a/codes/rust/chapter_searching/linear_search.rs b/codes/rust/chapter_searching/linear_search.rs
@@ -4,9 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
-use list_node::ListNode;
+use hello_algo_rust::include::ListNode;
 use std::cell::RefCell;
 use std::rc::Rc;
 

diff --git a/codes/rust/chapter_searching/two_sum.rs b/codes/rust/chapter_searching/two_sum.rs
@@ -4,8 +4,7 @@
  * Author: xBLACICEx ([email protected]), codingonion ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::print_util;
 use std::collections::HashMap;
 
 /* 方法一：暴力枚举 */

diff --git a/codes/rust/chapter_sorting/bubble_sort.rs b/codes/rust/chapter_sorting/bubble_sort.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 冒泡排序 */
 fn bubble_sort(nums: &mut [i32]) {

diff --git a/codes/rust/chapter_sorting/bucket_sort.rs b/codes/rust/chapter_sorting/bucket_sort.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 桶排序 */
 fn bucket_sort(nums: &mut [f64]) {

diff --git a/codes/rust/chapter_sorting/counting_sort.rs b/codes/rust/chapter_sorting/counting_sort.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 计数排序 */
 // 简单实现，无法用于排序对象

diff --git a/codes/rust/chapter_sorting/heap_sort.rs b/codes/rust/chapter_sorting/heap_sort.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 堆的长度为 n ，从节点 i 开始，从顶至底堆化 */
 fn sift_down(nums: &mut [i32], n: usize, mut i: usize) {

diff --git a/codes/rust/chapter_sorting/insertion_sort.rs b/codes/rust/chapter_sorting/insertion_sort.rs
@@ -4,7 +4,7 @@
  * Author: xBLACKICEx ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 插入排序 */
 fn insertion_sort(nums: &mut [i32]) {

diff --git a/codes/rust/chapter_sorting/radix_sort.rs b/codes/rust/chapter_sorting/radix_sort.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 获取元素 num 的第 k 位，其中 exp = 10^(k-1) */
 fn digit(num: i32, exp: i32) -> usize {

diff --git a/codes/rust/chapter_sorting/selection_sort.rs b/codes/rust/chapter_sorting/selection_sort.rs
@@ -4,7 +4,7 @@
  * Author: WSL0809 ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 选择排序 */
 fn selection_sort(nums: &mut [i32]) {

diff --git a/codes/rust/chapter_stack_and_queue/array_deque.rs b/codes/rust/chapter_stack_and_queue/array_deque.rs
@@ -3,9 +3,7 @@
  * Created Time: 2023-03-11
  * Author: codingonion ([email protected])
  */
-
-include!("../include/include.rs");
-
+use hello_algo_rust::include::print_util;
 /* 基于环形数组实现的双向队列 */
 struct ArrayDeque {
     nums: Vec<i32>,  // 用于存储双向队列元素的数组

diff --git a/codes/rust/chapter_stack_and_queue/array_stack.rs b/codes/rust/chapter_stack_and_queue/array_stack.rs
@@ -4,7 +4,7 @@
  * Author: WSL0809 ([email protected]), codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* 基于数组实现的栈 */
 struct ArrayStack<T> {

diff --git a/codes/rust/chapter_stack_and_queue/deque.rs b/codes/rust/chapter_stack_and_queue/deque.rs
@@ -4,8 +4,7 @@
  * Author: codingonion ([email protected]), xBLACKICEx ([email protected])
  */
 
-include!("../include/include.rs");
-
+use hello_algo_rust::include::print_util;
 use std::collections::VecDeque;
 
 /* Driver Code */

diff --git a/codes/rust/chapter_stack_and_queue/linkedlist_deque.rs b/codes/rust/chapter_stack_and_queue/linkedlist_deque.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::cell::RefCell;
 use std::rc::Rc;

diff --git a/codes/rust/chapter_stack_and_queue/linkedlist_queue.rs b/codes/rust/chapter_stack_and_queue/linkedlist_queue.rs
@@ -4,9 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::{print_util, ListNode};
 
-use list_node::ListNode;
 use std::cell::RefCell;
 use std::rc::Rc;
 

diff --git a/codes/rust/chapter_stack_and_queue/linkedlist_stack.rs b/codes/rust/chapter_stack_and_queue/linkedlist_stack.rs
@@ -4,9 +4,8 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::{print_util, ListNode};
 
-use list_node::ListNode;
 use std::cell::RefCell;
 use std::rc::Rc;
 

diff --git a/codes/rust/chapter_stack_and_queue/queue.rs b/codes/rust/chapter_stack_and_queue/queue.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected]), xBLACKICEx ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::collections::VecDeque;
 

diff --git a/codes/rust/chapter_stack_and_queue/stack.rs b/codes/rust/chapter_stack_and_queue/stack.rs
@@ -4,7 +4,7 @@
  * Author: codingonion ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 /* Driver Code */
 pub fn main() {

diff --git a/codes/rust/chapter_tree/array_binary_tree.rs b/codes/rust/chapter_tree/array_binary_tree.rs
@@ -4,7 +4,7 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::{print_util, tree_node};
 
 /* 数组表示下的二叉树类 */
 struct ArrayBinaryTree {

diff --git a/codes/rust/chapter_tree/avl_tree.rs b/codes/rust/chapter_tree/avl_tree.rs
@@ -4,12 +4,11 @@
  * Author: night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::{print_util, TreeNode};
 
 use std::cell::RefCell;
 use std::cmp::Ordering;
 use std::rc::Rc;
-use tree_node::TreeNode;
 
 type OptionTreeNodeRc = Option<Rc<RefCell<TreeNode>>>;
 

diff --git a/codes/rust/chapter_tree/binary_search_tree.rs b/codes/rust/chapter_tree/binary_search_tree.rs
@@ -4,13 +4,13 @@
  * Author: xBLACKICEx ([email protected])、night-cruise ([email protected])
  */
 
-include!("../include/include.rs");
+use hello_algo_rust::include::print_util;
 
 use std::cell::RefCell;
 use std::cmp::Ordering;
 use std::rc::Rc;
 
-use tree_node::TreeNode;
+use hello_algo_rust::include::TreeNode;
 
 type OptionTreeNodeRc = Option<Rc<RefCell<TreeNode>>>;