Cleanup

Author: twistedfall

Cargo.toml

@@ -46,8 +46,9 @@ vcpkg = "0.2.9"
 
 [dev-dependencies]
 matches = "0.1"
+# copy of build-dependencies because we need to test methods of the build script
 opencv-binding-generator = { version = "0.93.0", path = "binding-generator" }
-cc = { version = ">=1.0.83", features = ["parallel"] }
+cc = { version = "1.0.83", features = ["parallel"] }
 dunce = "1"
 # jobserver-0.1.25 is the first one that has Client::available() method
 jobserver = "0.1.25"

README.md

@@ -142,6 +142,8 @@ The following variables affect the building the of the `opencv` crate, but belon
   ```
   opencv = { version = ..., default-features = false, features = ["calib3d", "features2d", "flann"]}
   ```
+* `clang-runtime` - enables the runtime detection of libclang (`runtime` feature of `clang-sys`). Useful as a
+  workaround for when your dependencies (like `bindgen`) pull in `clang-sys` with hard `runtime` feature.
 * `rgb` - allow using [`rgb`](https://crates.io/crates/rgb) crate types as `Mat` elements
 
 ## API details

binding-generator/src/lib.rs

@@ -6,6 +6,7 @@
 // fixme vector<Mat*> get's interpreted as Vector<Mat> which should be wrong (e.g. Layer::forward and Layer::apply_halide_scheduler)
 // fixme MatConstIterator::m return Mat**, is it handled correctly?
 // fixme VectorOfMat::get allows mutation
+// fixme MatSize looks like just a pointer inside a Mat so it should take a lifetime
 
 // copy-pasted form python generator (may be obsolete):
 // fixme returning MatAllocator (trait) by reference is bad, check knearestneighbour

binding-generator/src/smart_ptr.rs

@@ -4,7 +4,6 @@ use std::fmt;
 use std::rc::Rc;
 
 use clang::Entity;
-
 pub use desc::SmartPtrDesc;
 
 use crate::element::ExcludeKind;

binding-generator/src/vector.rs

@@ -3,7 +3,6 @@ use std::fmt;
 use std::rc::Rc;
 
 use clang::Type;
-
 pub use desc::VectorDesc;
 
 use crate::element::ExcludeKind;

binding-generator/src/writer/rust_native/abstract_ref_wrapper.rs

@@ -2,14 +2,13 @@ use std::collections::HashMap;
 
 use once_cell::sync::Lazy;
 
+use super::type_ref::TypeRefExt;
+use super::RustNativeGeneratedElement;
 use crate::type_ref::Constness;
 use crate::writer::rust_native::class::ClassExt;
 use crate::writer::rust_native::element::RustElement;
 use crate::{AbstractRefWrapper, CompiledInterpolation, NameStyle, StrExt};
 
-use super::type_ref::TypeRefExt;
-use super::RustNativeGeneratedElement;
-
 impl RustNativeGeneratedElement for AbstractRefWrapper<'_, '_> {
 	fn element_order(&self) -> u8 {
 		10

binding-generator/src/writer/rust_native/enumeration.rs

@@ -3,13 +3,12 @@ use std::collections::HashMap;
 
 use once_cell::sync::Lazy;
 
+use super::element::{DefaultRustNativeElement, RustElement};
+use super::RustNativeGeneratedElement;
 use crate::debug::NameDebug;
 use crate::type_ref::{FishStyle, NameStyle};
 use crate::{CompiledInterpolation, EntityElement, Enum, StrExt};
 
-use super::element::{DefaultRustNativeElement, RustElement};
-use super::RustNativeGeneratedElement;
-
 impl RustElement for Enum<'_> {
 	fn rust_module(&self) -> Cow<str> {
 		DefaultRustNativeElement::rust_module(self.entity())

binding-generator/src/writer/rust_native/field.rs

@@ -1,12 +1,11 @@
 use std::borrow::Cow;
 
+use super::element::{DefaultRustNativeElement, RustElement};
 use crate::field::Field;
 use crate::type_ref::FishStyle;
 use crate::writer::rust_native::element::DebugRust;
 use crate::{reserved_rename, CowMapBorrowedExt, NameStyle, StrExt};
 
-use super::element::{DefaultRustNativeElement, RustElement};
-
 impl RustElement for Field<'_, '_> {
 	fn rust_module(&self) -> Cow<str> {
 		"".into()

binding-generator/src/writer/rust_native/function.rs

@@ -1,12 +1,11 @@
 use std::borrow::Cow;
 
+use super::element::RustElement;
+use super::type_ref::{NullabilityExt, TypeRefExt};
 use crate::function::Function;
 use crate::type_ref::{ExternDir, Nullability};
 use crate::{NameStyle, StringExt};
 
-use super::element::RustElement;
-use super::type_ref::{NullabilityExt, TypeRefExt};
-
 impl RustElement for Function<'_, '_> {
 	fn rust_module(&self) -> Cow<str> {
 		"<unset>".into()

binding-generator/src/writer/rust_native/string_ext.rs

@@ -1,6 +1,7 @@
-use crate::{NameStyle, StrExt};
 use std::borrow::Cow;
 
+use crate::{NameStyle, StrExt};
+
 pub trait RustStringExt {
 	fn rust_name_from_fullname(&self, style: NameStyle) -> Cow<str>;
 }