icu_capi clippy cleanup (unicode-org#4355)

hsivonen · Nov 27, 2023 · 0197253 · 0197253
1 parent 6f1a04b
commit 0197253
Show file tree

Hide file tree

Showing 25 changed files with 102 additions and 19 deletions.
diff --git a/ffi/capi/c/include/ICU4XList.h b/ffi/capi/c/include/ICU4XList.h
diff --git a/ffi/capi/c/include/ICU4XReorderedIndexMap.h b/ffi/capi/c/include/ICU4XReorderedIndexMap.h
diff --git a/ffi/capi/cpp/docs/source/bidi_ffi.rst b/ffi/capi/cpp/docs/source/bidi_ffi.rst
diff --git a/ffi/capi/cpp/docs/source/list_ffi.rst b/ffi/capi/cpp/docs/source/list_ffi.rst
diff --git a/ffi/capi/cpp/include/ICU4XList.h b/ffi/capi/cpp/include/ICU4XList.h
diff --git a/ffi/capi/cpp/include/ICU4XList.hpp b/ffi/capi/cpp/include/ICU4XList.hpp
diff --git a/ffi/capi/cpp/include/ICU4XReorderedIndexMap.h b/ffi/capi/cpp/include/ICU4XReorderedIndexMap.h
diff --git a/ffi/capi/cpp/include/ICU4XReorderedIndexMap.hpp b/ffi/capi/cpp/include/ICU4XReorderedIndexMap.hpp
diff --git a/ffi/capi/dart/package/lib/src/List.g.dart b/ffi/capi/dart/package/lib/src/List.g.dart
diff --git a/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart b/ffi/capi/dart/package/lib/src/ReorderedIndexMap.g.dart
diff --git a/ffi/capi/js/package/docs/source/bidi_ffi.rst b/ffi/capi/js/package/docs/source/bidi_ffi.rst
diff --git a/ffi/capi/js/package/docs/source/list_ffi.rst b/ffi/capi/js/package/docs/source/list_ffi.rst
diff --git a/ffi/capi/js/package/lib/ICU4XList.d.ts b/ffi/capi/js/package/lib/ICU4XList.d.ts
diff --git a/ffi/capi/js/package/lib/ICU4XList.js b/ffi/capi/js/package/lib/ICU4XList.js
diff --git a/ffi/capi/js/package/lib/ICU4XReorderedIndexMap.d.ts b/ffi/capi/js/package/lib/ICU4XReorderedIndexMap.d.ts
diff --git a/ffi/capi/js/package/lib/ICU4XReorderedIndexMap.js b/ffi/capi/js/package/lib/ICU4XReorderedIndexMap.js
diff --git a/ffi/capi/src/bidi.rs b/ffi/capi/src/bidi.rs
@@ -122,12 +122,16 @@ pub mod ffi {
         }
 
         /// The length of this map
-        #[allow(clippy::len_without_is_empty)]
         #[diplomat::attr(dart, rename = "length")]
         pub fn len(&self) -> usize {
             self.0.len()
         }
 
+        /// Whether this map is empty
+        pub fn is_empty(&self) -> bool {
+            self.0.is_empty()
+        }
+
         /// Get element at `index`. Returns 0 when out of bounds
         /// (note that 0 is also a valid in-bounds value, please use `len()`
         /// to avoid out-of-bounds)

diff --git a/ffi/capi/src/lib.rs b/ffi/capi/src/lib.rs
@@ -14,9 +14,12 @@
         // Exhaustiveness and Debug is not required for Diplomat types
     )
 )]
-#![allow(clippy::upper_case_acronyms)]
-#![allow(clippy::needless_lifetimes)]
-#![allow(clippy::result_unit_err)]
+// Diplomat limitations
+#![allow(
+    clippy::needless_lifetimes,
+    clippy::result_unit_err,
+    clippy::should_implement_trait
+)]
 
 //! This crate contains the source of truth for the [Diplomat](https://github.com/rust-diplomat/diplomat)-generated
 //! FFI bindings. This generates the C, C++, JavaScript, and TypeScript bindings. This crate also contains the `extern "C"`

diff --git a/ffi/capi/src/list.rs b/ffi/capi/src/list.rs
@@ -39,11 +39,15 @@ pub mod ffi {
         }
 
         /// The number of elements in this list
-        #[allow(clippy::len_without_is_empty)] // don't need to follow Rust conventions over FFI
         #[diplomat::attr(dart, rename = "length")]
         pub fn len(&self) -> usize {
             self.0.len()
         }
+
+        /// Whether this list is empty
+        pub fn is_empty(&self) -> bool {
+            self.0.is_empty()
+        }
     }
 
     #[diplomat::rust_link(icu::list::ListLength, Enum)]

diff --git a/ffi/capi/src/locale.rs b/ffi/capi/src/locale.rs
@@ -40,7 +40,6 @@ pub mod ffi {
 
         /// Clones the [`ICU4XLocale`].
         #[diplomat::rust_link(icu::locid::Locale, Struct)]
-        #[allow(clippy::should_implement_trait)]
         pub fn clone(&self) -> Box<ICU4XLocale> {
             Box::new(ICU4XLocale(self.0.clone()))
         }

diff --git a/ffi/capi/src/properties_iter.rs b/ffi/capi/src/properties_iter.rs
@@ -29,7 +29,6 @@ pub mod ffi {
         /// Advance the iterator by one and return the next range.
         ///
         /// If the iterator is out of items, `done` will be true
-        #[allow(clippy::should_implement_trait)] // Rust isn't calling this code
         pub fn next(&mut self) -> CodePointRangeIteratorResult {
             self.0
                 .next()

diff --git a/ffi/capi/src/segmenter_grapheme.rs b/ffi/capi/src/segmenter_grapheme.rs
@@ -101,7 +101,6 @@ pub mod ffi {
     impl<'a> ICU4XGraphemeClusterBreakIteratorUtf8<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::GraphemeClusterBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::GraphemeClusterBreakIterator::Item,
@@ -119,7 +118,6 @@ pub mod ffi {
     impl<'a> ICU4XGraphemeClusterBreakIteratorUtf16<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::GraphemeClusterBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::GraphemeClusterBreakIterator::Item,
@@ -137,7 +135,6 @@ pub mod ffi {
     impl<'a> ICU4XGraphemeClusterBreakIteratorLatin1<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::GraphemeClusterBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::GraphemeClusterBreakIterator::Item,

diff --git a/ffi/capi/src/segmenter_line.rs b/ffi/capi/src/segmenter_line.rs
@@ -187,7 +187,6 @@ pub mod ffi {
     impl<'a> ICU4XLineBreakIteratorUtf8<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::LineBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::LineBreakIterator::Item,
@@ -205,7 +204,6 @@ pub mod ffi {
     impl<'a> ICU4XLineBreakIteratorUtf16<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::LineBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::LineBreakIterator::Item,
@@ -223,7 +221,6 @@ pub mod ffi {
     impl<'a> ICU4XLineBreakIteratorLatin1<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::LineBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::LineBreakIterator::Item,

diff --git a/ffi/capi/src/segmenter_sentence.rs b/ffi/capi/src/segmenter_sentence.rs
@@ -88,7 +88,6 @@ pub mod ffi {
     impl<'a> ICU4XSentenceBreakIteratorUtf8<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::SentenceBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::SentenceBreakIterator::Item,
@@ -106,7 +105,6 @@ pub mod ffi {
     impl<'a> ICU4XSentenceBreakIteratorUtf16<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::SentenceBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::SentenceBreakIterator::Item,
@@ -124,7 +122,6 @@ pub mod ffi {
     impl<'a> ICU4XSentenceBreakIteratorLatin1<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::SentenceBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::SentenceBreakIterator::Item,

diff --git a/ffi/capi/src/segmenter_word.rs b/ffi/capi/src/segmenter_word.rs
@@ -124,7 +124,6 @@ pub mod ffi {
     impl<'a> ICU4XWordBreakIteratorUtf8<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::WordBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::WordBreakIterator::Item,
@@ -154,7 +153,6 @@ pub mod ffi {
     impl<'a> ICU4XWordBreakIteratorUtf16<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::WordBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::WordBreakIterator::Item,
@@ -184,7 +182,6 @@ pub mod ffi {
     impl<'a> ICU4XWordBreakIteratorLatin1<'a> {
         /// Finds the next breakpoint. Returns -1 if at the end of the string or if the index is
         /// out of range of a 32-bit signed integer.
-        #[allow(clippy::should_implement_trait)]
         #[diplomat::rust_link(icu::segmenter::WordBreakIterator::next, FnInStruct)]
         #[diplomat::rust_link(
             icu::segmenter::WordBreakIterator::Item,