update project

magiclen · magiclen · commit 4557dcd00b3f · 2022-03-17T16:09:45.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
           toolchain: nightly
           override: true
           components: clippy
-      - run: cargo clippy -- -D warnings
+      - run: cargo clippy --all-targets --all-features -- -D warnings
 
   tests:
     strategy:
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "lazy-static-include"
-version = "3.1.1"
+version = "3.1.2"
 authors = ["Magic Len <len@magiclen.org>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/magiclen/lazy-static-include"
 homepage = "https://magiclen.org/lazy-static-include"
 keywords = ["lazy", "macro", "static", "include"]
@@ -22,6 +22,8 @@ bencher = "0.1.5"
 serde_json = "1.0"
 assert_approx_eq = "1.1"
 
+slash-formatter = "3.1.3"
+
 [[bench]]
 name = "bench"
 harness = false
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -1,27 +1,17 @@
-#[macro_use]
-extern crate bencher;
-
 #[macro_use]
 extern crate lazy_static_include;
 
-#[macro_use]
-extern crate slash_formatter;
-
-extern crate serde_json;
-
 use std::fs::File;
 use std::io::Read;
 use std::str::from_utf8_unchecked;
 
-use bencher::Bencher;
+use bencher::{benchmark_group, benchmark_main, Bencher};
+use slash_formatter::concat_with_file_separator;
 
 macro_rules! benchmark_text_path {
     () => {
         concat_with_file_separator!(env!("CARGO_MANIFEST_DIR"), "data", "benchmark.txt")
     };
-    (relative) => {
-        concat_with_file_separator!("data", "benchmark.txt")
-    };
 }
 
 fn include_str_no_static(bencher: &mut Bencher) {
@@ -46,7 +36,7 @@ fn include_str_native_static(bencher: &mut Bencher) {
 
 fn include_str_lazy_static(bencher: &mut Bencher) {
     lazy_static_include_str! {
-        pub TEXT => benchmark_text_path!(relative)
+        pub TEXT => "data/benchmark.txt"
     }
 
     bencher.iter(|| TEXT.contains("figarofigaro"));
@@ -78,7 +68,7 @@ fn include_bytes_native_static(bencher: &mut Bencher) {
 
 fn include_bytes_lazy_static(bencher: &mut Bencher) {
     lazy_static_include_bytes! {
-        DATA => benchmark_text_path!(relative)
+        DATA => "data/benchmark.txt"
     }
 
     bencher.iter(|| {
@@ -112,7 +102,7 @@ fn include_array_native_static(bencher: &mut Bencher) {
 
 fn include_array_lazy_static(bencher: &mut Bencher) {
     lazy_static_include_array! {
-        ARRAY: [&'static str; 622] => benchmark_text_path!(relative)
+        ARRAY: [&'static str; 622] => "data/benchmark.txt"
     }
 
     bencher.iter(|| ARRAY.binary_search(&"figarofigaro").is_ok());
diff --git a/tests/macros.rs b/tests/macros.rs
@@ -1,8 +1,7 @@
 #[macro_use]
 extern crate lazy_static_include;
 
-#[macro_use]
-extern crate assert_approx_eq;
+use assert_approx_eq::assert_approx_eq;
 
 #[test]
 fn include_str() {
@@ -229,9 +228,9 @@ fn include_array_bool() {
         pub TEST: [bool; 3] => "data/bool_array.txt",
     }
 
-    assert_eq!(false, TEST[0]);
-    assert_eq!(true, TEST[1]);
-    assert_eq!(false, TEST[2]);
+    assert!(!TEST[0]);
+    assert!(TEST[1]);
+    assert!(!TEST[2]);
 }
 
 #[test]
