fix: Fix clippy lints

GrayJack · Nov 19, 2024 · 94b5498 · 94b5498
1 parent 818fb73
commit 94b5498
Show file tree

Hide file tree

Showing 16 changed files with 163 additions and 166 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ targets = [
 ]
 all-features = false
 features = ["amalgation", "nightly"]
-rustdoc-args = ["--cfg", "_doc"]
+rustdoc-args = ["--cfg", "docsrs"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/janetrs_version/src/lib.rs b/janetrs_version/src/lib.rs
@@ -147,8 +147,7 @@ impl PartialEq<&str> for JanetVersion {
                 .map(|s| s.parse::<u32>())
                 .take(3)
                 .zip([self.major, self.minor, self.patch].iter())
-                .map(|(o, s)| o.unwrap_or(u32::MAX).eq(s))
-                .all(core::convert::identity)
+                .all(|(o, s)| o.unwrap_or(u32::MAX).eq(s))
         }
     }
 }

diff --git a/src/allocator.rs b/src/allocator.rs
@@ -19,7 +19,6 @@ use core::alloc::{AllocError, Allocator};
     target_arch = "powerpc",
     target_arch = "powerpc64",
     target_arch = "sparc",
-    target_arch = "asmjs",
     target_arch = "wasm32",
     target_arch = "hexagon",
     target_arch = "riscv32"
@@ -155,7 +154,7 @@ impl Scratch {
 }
 
 #[cfg(feature = "nightly")]
-#[cfg_attr(_doc, doc(cfg(feature = "nightly")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "nightly")))]
 unsafe impl Allocator for Scratch {
     fn allocate(&self, layout: Layout) -> Result<NonNull<[u8]>, AllocError> {
         self.malloc(layout).ok_or(AllocError)

diff --git a/src/client.rs b/src/client.rs
@@ -53,7 +53,7 @@ impl Display for Error {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(_doc, doc(cfg(feature = "std")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl StdError for Error {}
 
 /// Janet client that initialize the Janet runtime.

diff --git a/src/lib.rs b/src/lib.rs
@@ -15,7 +15,7 @@
 //! ## Cargo Features
 //!
 //! - `std`: Enable some trait impl for types that only exist on the `std` and the Error
-//! trait
+//!   trait
 //! - `unicode`: Enable more methods for JanetString and JanetBuffer
 //! - `inline-more`: More aggressive inlining
 //! - `amalgation`: Link the Janet runtime to the package, enabling to use the client
@@ -56,7 +56,7 @@
 //!  - Marshalling mechanism
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(feature = "nightly", feature(allocator_api))]
-#![cfg_attr(_doc, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 // Cause compilation error when both amalgation and system is set
 #[cfg(all(feature = "amalgation", feature = "link-system"))]
@@ -77,7 +77,7 @@ pub mod lowlevel {
 
 pub mod allocator;
 #[cfg(any(feature = "amalgation", feature = "link-system"))]
-#[cfg_attr(_doc, doc(cfg(any(feature = "amalgation", feature = "link-system"))))]
+#[cfg_attr(docsrs, doc(cfg(any(feature = "amalgation", feature = "link-system"))))]
 pub mod client;
 pub mod env;
 mod gc;

diff --git a/src/macros.rs b/src/macros.rs
@@ -11,7 +11,7 @@ macro_rules! count {
 /// expressions. There are 2 forms of this macro:
 ///  * Create a [`JanetTuple`] containing a given list of elements
 /// ```
-/// use janetrs::{tuple, Janet};
+/// use janetrs::{Janet, tuple};
 /// # let _client = janetrs::client::JanetClient::init().unwrap();
 ///
 /// let t = tuple![3, true, "hey"];
@@ -60,7 +60,7 @@ macro_rules! tuple {
 /// expressions. There are 2 forms of this macro:
 ///  * Create a [`JanetArray`] containing a given list of elements
 /// ```
-/// use janetrs::{array, Janet};
+/// use janetrs::{Janet, array};
 /// # let _client = janetrs::client::JanetClient::init().unwrap();
 ///
 /// let arr = array![3, true, "hey"];
@@ -115,7 +115,7 @@ macro_rules! array {
 /// pairs as the items of the struct.
 ///
 /// ```
-/// use janetrs::{structs, Janet};
+/// use janetrs::{Janet, structs};
 /// # let _client = janetrs::client::JanetClient::init().unwrap();
 ///
 /// let st = structs! {
@@ -151,7 +151,7 @@ macro_rules! structs {
 /// pairs as the items of the struct.
 ///
 /// ```
-/// use janetrs::{table, Janet};
+/// use janetrs::{Janet, table};
 /// # let _client = janetrs::client::JanetClient::init().unwrap();
 ///
 /// let table = table! {
@@ -302,7 +302,7 @@ macro_rules! jpanic {
 /// # Examples
 ///
 /// ```
-/// use janetrs::{bad_slot, janet_fn, Janet, TaggedJanet};
+/// use janetrs::{Janet, TaggedJanet, bad_slot, janet_fn};
 ///
 /// #[janet_fn(arity(fix(1)))]
 /// fn hi(args: &mut [Janet]) -> Janet {
@@ -385,7 +385,7 @@ macro_rules! jcatch {
 ///
 /// [`catch_unwind`]: https://doc.rust-lang.org/std/panic/fn.catch_unwind.html
 #[cfg(feature = "std")]
-#[cfg_attr(_doc, doc(cfg(feature = "std")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 #[macro_export]
 macro_rules! jtry {
     ($e:expr) => {{

diff --git a/src/types.rs b/src/types.rs
@@ -109,7 +109,7 @@ impl JanetConversionError {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(_doc, doc(cfg(feature = "std")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl error::Error for JanetConversionError {}
 
 impl Display for JanetConversionError {
@@ -760,7 +760,7 @@ impl Display for Janet {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(_doc, doc(cfg(feature = "std")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl error::Error for Janet {}
 
 impl PartialEq<&Self> for Janet {
@@ -1724,7 +1724,7 @@ macro_rules! string_impl_partial_eq {
     };
     (#[cfg($attr:meta)]; $lhs:ty, $rhs:ty) => {
         #[cfg($attr)]
-        #[cfg_attr(_doc, doc(cfg($attr)))]
+        #[cfg_attr(docsrs, doc(cfg($attr)))]
         #[allow(clippy::extra_unused_lifetimes)]
         impl<'a, 'b> PartialEq<$rhs> for $lhs {
             #[inline]
@@ -1735,7 +1735,7 @@ macro_rules! string_impl_partial_eq {
         }
 
         #[cfg($attr)]
-        #[cfg_attr(_doc, doc(cfg($attr)))]
+        #[cfg_attr(docsrs, doc(cfg($attr)))]
         #[allow(clippy::extra_unused_lifetimes)]
         impl<'a, 'b> PartialEq<$lhs> for $rhs {
             #[inline]
@@ -1774,7 +1774,7 @@ macro_rules! string_impl_partial_ord {
     };
     (#[cfg($attr:meta)]; $lhs:ty, $rhs:ty) => {
         #[cfg($attr)]
-        #[cfg_attr(_doc, doc(cfg($attr)))]
+        #[cfg_attr(docsrs, doc(cfg($attr)))]
         #[allow(clippy::extra_unused_lifetimes)]
         impl<'a, 'b> PartialOrd<$rhs> for $lhs {
             #[inline]
@@ -1785,7 +1785,7 @@ macro_rules! string_impl_partial_ord {
         }
 
         #[cfg($attr)]
-        #[cfg_attr(_doc, doc(cfg($attr)))]
+        #[cfg_attr(docsrs, doc(cfg($attr)))]
         #[allow(clippy::extra_unused_lifetimes)]
         impl<'a, 'b> PartialOrd<$lhs> for $rhs {
             #[inline]

diff --git a/src/types/abstract.rs b/src/types/abstract.rs
@@ -35,7 +35,7 @@ impl fmt::Display for AbstractError {
 }
 
 #[cfg(feature = "std")]
-#[cfg_attr(_doc, doc(cfg(feature = "std")))]
+#[cfg_attr(docsrs, doc(cfg(feature = "std")))]
 impl std::error::Error for AbstractError {}
 
 /// Type that represents the Janet Abstract type.