Merge branch 'xmh0511-main'

Fix clippy errors, testings and more.

Author: fefit

.github/workflows/rust.yml

@@ -0,0 +1,32 @@
+name: Rust CI
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  check:
+    name: Cargo Fmt, Check, and Clippy
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          components: clippy, rustfmt
+
+      - name: Cargo Fmt
+        run: cargo fmt --all -- --check
+
+      - name: Cargo Check (all features)
+        run: cargo check --all --all-features
+
+      - name: Cargo Clippy (all features)
+        run: cargo clippy --all --all-features -- -D warnings

.github/workflows/test.yml

@@ -1,47 +1,42 @@
 name: test
 on:
-  - push
+  push:
+
 jobs:
-  # Task test
   test:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      # Checkout repo
       - name: Checkout repo
         uses: actions/checkout@v3
-      # Install toolchain
-      - name: Install toolchain
+      - name: Install Rust stable toolchain
         uses: dtolnay/rust-toolchain@stable
-      # build coverage
       - name: Run unit tests
         run: cargo test --features full
-  # Task coverage
+
   coverage:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-      # Checkout repo
       - name: Checkout repo
         uses: actions/checkout@v3
-      # Install toolchain
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@nightly
-      # Install grcov
+      - name: Install Rust stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install llvm-tools
+        run: rustup component add llvm-tools-preview
       - name: Install grcov
-        run: curl -L https://github.com/mozilla/grcov/releases/download/v0.8.2/grcov-linux-x86_64.tar.bz2 | tar jxf -
-      # Run coverage
-      - name: Build coverage
+        run: cargo install grcov
+      - name: Build and test with coverage instrumentation
         run: |
           export CARGO_INCREMENTAL=0
-          export RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
-          export RUSTDOCFLAGS="-Cpanic=abort"
+          export RUSTFLAGS="-C instrument-coverage"
+          export LLVM_PROFILE_FILE="cargo-test-%p-%m.profraw"
           cargo build --features full --verbose $CARGO_OPTIONS
           cargo test --features full --verbose $CARGO_OPTIONS
-          zip -0 ccov.zip `find . \( -name "visdom*.gc*" \) -print`;
-          ./grcov ccov.zip -s . -t lcov --llvm --branch --ignore-not-existing --ignore "/*" -o lcov.info;
-          bash <(curl -s https://codecov.io/bash) -f lcov.info;
+          mkdir coverage
+          grcov . --binary-path ./target/debug/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o coverage/lcov.info
+      - name: Upload coverage to Codecov
+        run: bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

src/lib.rs

@@ -81,21 +81,21 @@ impl Dom {
 				Dom::halt(
 					dom,
 					method,
-					&format!("Can't {} for a {:?} type", method, my_node_type),
+					&format!("Can't {method} for a {my_node_type:?} type"),
 				);
 				return false;
 			}
 			// document
 			if let INodeType::Document = node.node_type() {
-				Dom::halt(dom, method, &format!("Can't {} a document type", method));
+				Dom::halt(dom, method, &format!("Can't {method} a document type"));
 				return false;
 			}
 			// test if same node
 			if dom.is(node) {
 				Dom::halt(
 					dom,
 					method,
-					&format!("Can't {} a dom that contains itself.", method),
+					&format!("Can't {method} a dom that contains itself."),
 				);
 				return false;
 			}
@@ -106,7 +106,7 @@ impl Dom {
 					Dom::halt(
 						dom,
 						method,
-						&format!("Can't {} a dom that contains it's parent", method),
+						&format!("Can't {method} a dom that contains it's parent"),
 					);
 					return false;
 				}
@@ -363,7 +363,7 @@ impl INodeTrait for Rc<RefCell<Node>> {
 							reset_next_siblings_index(0, &nodes);
 						}
 						// set childs as new nodes
-						(*target.borrow_mut()).childs = if has_nodes { Some(nodes) } else { None };
+						target.borrow_mut().childs = if has_nodes { Some(nodes) } else { None };
 					} else if let Some(childs) = &mut target.borrow_mut().childs {
 						let index = self.index();
 						// not last node, whenever nodes is empty or not, reset next childs indexs
@@ -453,7 +453,7 @@ impl IElementTrait for Rc<RefCell<Node>> {
 			cur_type => Dom::halt(
 				self,
 				"tag_name",
-				&format!("The node type of '{:?}' doesn't have a tag name.", cur_type),
+				&format!("The node type of '{cur_type:?}' doesn't have a tag name."),
 			),
 		};
 		vec![]
@@ -919,7 +919,7 @@ impl IElementTrait for Rc<RefCell<Node>> {
 				Dom::halt(
 					self,
 					action,
-					&format!("Can't {} that not implemented 'Dom'", action),
+					&format!("Can't {action} that not implemented 'Dom'"),
 				);
 			}
 		}
@@ -986,7 +986,7 @@ impl IElementTrait for Rc<RefCell<Node>> {
 				Dom::halt(
 					self,
 					action,
-					&format!("Can't {} that not implemented 'Dom'", action),
+					&format!("Can't {action} that not implemented 'Dom'"),
 				);
 			}
 		}

src/main.rs

@@ -1,9 +1,6 @@
 #![allow(clippy::unnecessary_wraps)]
-use std::thread;
-use std::time::SystemTime;
-use std::{collections::VecDeque, error::Error};
-use visdom::types::{BoxDynError, IDocumentTrait};
-use visdom::types::{BoxDynNode, INodeType};
+use visdom::types::BoxDynError;
+use visdom::types::INodeType;
 use visdom::Vis;
 
 fn main() -> Result<(), BoxDynError> {
@@ -306,14 +303,15 @@ fn main() -> Result<(), BoxDynError> {
 	// let div_no_has_p = divs.not(":has(p)");
 	// println!("div_no_has_p: {}", div_no_has_p.text());
 	let content = root.find("#content");
+	#[cfg(feature = "text")]
 	content.texts_by_rec(
 		0,
 		Box::new(|_, text_node| {
 			println!("{}", text_node.text());
 			true
 		}),
 		Box::new(|ele| {
-			let tag_name = ele.tag_name();
+			let _tag_name = ele.tag_name();
 			true
 		}),
 	);
@@ -323,18 +321,22 @@ fn main() -> Result<(), BoxDynError> {
 			child.set_text("abc");
 		}
 	}
-	let pseduo_root = root.find(":root");
+	let _pseduo_root = root.find(":root");
 	let child_nodes = root.get(0).unwrap().child_nodes();
 	println!("{}", child_nodes[1].text_content());
 	println!("{}", content.html());
+	#[allow(unused_mut)]
 	let mut test_clone = root.find("#test_clone");
 	println!("test_clone:{:?}", test_clone.html());
-	let test_clone_new = test_clone.clone();
-	test_clone_new.find(".abc").set_text("哈哈哈");
-	println!("test_clone:{:?}", test_clone.html());
-	println!("test_clone_new:{:?}", test_clone_new.html());
-	test_clone_new.find(".abc").append_to(&mut test_clone);
-	println!("test_clone:{:?}", test_clone.html());
-	println!("test_clone_new:{:?}", test_clone_new.html());
+	#[cfg(any(feature = "insertion", feature = "destroy"))]
+	{
+		let test_clone_new = test_clone.clone();
+		test_clone_new.find(".abc").set_text("哈哈哈");
+		println!("test_clone:{:?}", test_clone.html());
+		println!("test_clone_new:{:?}", test_clone_new.html());
+		test_clone_new.find(".abc").append_to(&mut test_clone);
+		println!("test_clone:{:?}", test_clone.html());
+		println!("test_clone_new:{:?}", test_clone_new.html());
+	};
 	Ok(())
 }

src/mesdoc/interface/element.rs

@@ -3,6 +3,7 @@ cfg_feat_text! {
 }
 use super::{BoxDynNode, BoxDynText, Elements, INodeTrait, INodeType};
 use crate::mesdoc::error::{BoxDynError, Error as IError};
+use std::fmt::Display;
 use std::ops::Range;
 
 pub type BoxDynElement<'a> = Box<dyn IElementTrait + 'a>;
@@ -35,12 +36,12 @@ impl IAttrValue {
 	}
 }
 
-/// impl `ToString` for IAttrValue
-impl ToString for IAttrValue {
-	fn to_string(&self) -> String {
+/// impl `Display` for IAttrValue
+impl Display for IAttrValue {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
-			IAttrValue::Value(v, _) => v.clone(),
-			IAttrValue::True => String::new(),
+			IAttrValue::Value(v, _) => write!(f, "{v}"),
+			IAttrValue::True => write!(f, ""),
 		}
 	}
 }
@@ -52,11 +53,11 @@ pub enum IFormValue {
 	Multiple(Vec<String>),
 }
 
-impl ToString for IFormValue {
-	fn to_string(&self) -> String {
+impl Display for IFormValue {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {
-			IFormValue::Single(v) => v.clone(),
-			IFormValue::Multiple(v) => v.join(","),
+			IFormValue::Single(v) => write!(f, "{v}"),
+			IFormValue::Multiple(v) => write!(f, "{}", v.join(",")),
 		}
 	}
 }
@@ -261,6 +262,7 @@ pub trait IElementTrait: INodeTrait {
 	// element child nodes
 	fn child_nodes_length(&self) -> usize;
 	fn child_nodes_item<'b>(&self, index: usize) -> Option<BoxDynNode<'b>>;
+	#[allow(clippy::type_complexity)]
 	fn child_nodes_item_since_by<'a>(
 		&'a self,
 		node_index: usize,
@@ -293,6 +295,7 @@ pub trait IElementTrait: INodeTrait {
 		}
 		result
 	}
+	#[allow(clippy::type_complexity)]
 	fn children_by<'a>(&'a self, matcher: Box<dyn FnMut(&dyn IElementTrait) + 'a>);
 	// attribute
 	fn get_attribute(&self, name: &str) -> Option<IAttrValue>;
@@ -360,7 +363,7 @@ mod tests {
 	fn test_i_attr_value() {
 		// string value
 		let attr_value = IAttrValue::Value("Hello".into(), None);
-		assert!(format!("{:?}", attr_value).contains("Hello"));
+		assert!(format!("{attr_value:?}").contains("Hello"));
 		assert!(attr_value.is_str("Hello"));
 		assert!(!attr_value.is_true());
 		assert_eq!(attr_value.to_list(), vec!["Hello"]);

src/mesdoc/interface/elements.rs

@@ -382,7 +382,7 @@ impl<'a> Elements<'a> {
 				// set prev parent
 				prev_parent = Some(parent);
 				// new parent
-				if parents_indexs.get(&indexs).is_none() {
+				if !parents_indexs.contains(&indexs) {
 					parents_indexs.insert(indexs);
 					uniques.push(ele.cloned());
 				}
@@ -3127,6 +3127,7 @@ impl<'a> Elements<'a> {
 
 		/// pub fn `texts_by`
 		/// get the text node of each element, filter by the handle
+		#[allow(clippy::type_complexity)]
 		pub fn texts_by(
 			&self,
 			limit_depth: usize,
@@ -3137,6 +3138,7 @@ impl<'a> Elements<'a> {
 
 		/// pub fn `texts_by_rec`
 		/// get the text node of each element, filter by the handle, and check if need recursive by the result of rec_handle with child element
+		#[allow(clippy::type_complexity)]
 		pub fn texts_by_rec(
 			&self,
 			limit_depth: usize,

src/mesdoc/interface/node.rs

@@ -65,7 +65,7 @@ pub trait INodeTrait {
 	}
 	// text
 	fn text_content(&self) -> String {
-		return self.text_contents().iter().collect::<String>();
+		self.text_contents().iter().collect::<String>()
 	}
 	fn text(&self) -> String {
 		self.text_content()
@@ -87,7 +87,7 @@ mod tests {
 	#[test]
 	fn test_inode_type() {
 		let element_type = INodeType::Element;
-		assert!(format!("{:?}", element_type).contains("Element"));
+		assert!(format!("{element_type:?}").contains("Element"));
 		assert!(element_type.is_element());
 	}
 }

src/mesdoc/rules/attr.rs

@@ -18,8 +18,9 @@ pub fn init(rules: &mut Vec<RuleItem>) {
 				.get("2")
 				.or_else(|| value_data.get("3"))
 				.or_else(|| value_data.get("4"))
-				.map(|s| s.clone());
+				.cloned();
 			let match_mode = value_data.get("1").unwrap_or(&def_mode);
+			#[allow(clippy::type_complexity)]
 			let handle: Box<dyn Fn(&Option<IAttrValue>) -> bool> = if let Some(attr_value) = attr_value {
 				let match_mode = match_mode.as_str();
 				if attr_value.is_empty() && !matches!(match_mode, "" | "!" | "|") {
@@ -48,7 +49,7 @@ pub fn init(rules: &mut Vec<RuleItem>) {
 								if *v == attr_value {
 									return true;
 								}
-								let attr_value: String = format!("{}-", attr_value);
+								let attr_value: String = format!("{attr_value}-");
 								v.starts_with(&attr_value)
 							}
 							_ => attr_value.is_empty(),

src/mesdoc/rules/id.rs

@@ -21,7 +21,7 @@ pub fn init(rules: &mut Vec<RuleItem>) {
 						if !eles.is_empty() {
 							let first_ele = eles
 								.get_ref()
-								.get(0)
+								.first()
 								.expect("The elements must have at least one element.");
 							if let Some(doc) = &first_ele.owner_document() {
 								if let Some(id_element) = doc.get_element_by_id(&id) {

src/mesdoc/rules/pseudo.rs

@@ -342,8 +342,8 @@ fn make_asc_or_desc_nth_child(selector: &'static str, asc: bool) -> RuleDefItem
 		PRIORITY,
 		Box::new(move |data: MatchedQueue| {
 			let nth_data = &data[2].data;
-			let n = nth_data.get("n").map(|s| s.clone());
-			let index = nth_data.get("index").map(|s| s.clone());
+			let n = nth_data.get("n").cloned();
+			let index = nth_data.get("index").cloned();
 			let handle = make_asc_or_desc_nth_child_handle(asc);
 			let specified_handle = if n.is_none() {
 				let index = nth_index_to_number(&index);
@@ -605,8 +605,8 @@ fn make_asc_or_desc_nth_of_type(selector: &'static str, asc: bool) -> RuleDefIte
 		PRIORITY,
 		Box::new(move |mut data: MatchedQueue| {
 			let nth_data = data.remove(2).data;
-			let n = nth_data.get("n").map(|s| s.clone());
-			let index = nth_data.get("index").map(|s| s.clone());
+			let n = nth_data.get("n").cloned();
+			let index = nth_data.get("index").cloned();
 			let specified_handle = if n.is_none() {
 				let index = nth_index_to_number(&index);
 				Some(make_asc_or_desc_nth_of_type_specified(asc, index))