Add Cargo configuration and improve control identifier handling in FDB

Author: Choochmeque

.cargo/config.toml

@@ -0,0 +1,15 @@
+[build]
+jobs = -1
+
+[target.'cfg(all())']
+rustflags = [
+    "-Wclippy::all",
+    "-Wclippy::pedantic",
+    "-Wclippy::nursery",
+    "-Wclippy::unwrap_used",
+    "-Aclippy::module_name_repetitions",
+    "-Aclippy::missing_errors_doc",
+]
+
+[net]
+git-fetch-with-cli = true

rust/crates/fdb-sys/build.rs

@@ -530,7 +530,7 @@ fn emit_rpath_flags() {
 
 /// Copy libraries to target directory for portable binaries.
 /// Returns the path to the libs directory where libraries were copied.
-/// This MUST be called BEFORE emit_link_directives so we link against the copied location.
+/// This MUST be called BEFORE `emit_link_directives` so we link against the copied location.
 #[cfg(feature = "vendored")]
 fn copy_resources_to_output(
     fdb_install_dir: &std::path::Path,
@@ -562,7 +562,9 @@ fn copy_resources_to_output(
             let file_name = path.file_name().and_then(|n| n.to_str()).unwrap_or("");
 
             // Match .so, .dylib, and versioned .so.X files
-            let is_shared_lib = file_name.ends_with(".dylib")
+            let is_shared_lib = std::path::Path::new(file_name)
+                .extension()
+                .is_some_and(|ext| ext.eq_ignore_ascii_case("dylib"))
                 || file_name.contains(".so")
                 || path.extension().is_some_and(|ext| ext == "so");
 
@@ -594,5 +596,5 @@ fn copy_resources_to_output(
     // Export resource directory name for runtime discovery
     println!("cargo:rustc-env=FDB_LIBS_DIR=fdb_libs");
 
-    libs_dest.to_path_buf()
+    libs_dest.clone()
 }

rust/crates/fdb-sys/cpp/fdb_bridge.cpp

@@ -122,44 +122,6 @@ static fdb5::FDBToolRequest make_tool_request(const std::string& request_str) {
     return fdb5::FDBToolRequest{mars, all, std::vector<std::string>{}};
 }
 
-/// Convert ControlIdentifier enum to string
-static std::string control_identifier_to_string(fdb5::ControlIdentifier id) {
-    switch (id) {
-        case fdb5::ControlIdentifier::List:
-            return "list";
-        case fdb5::ControlIdentifier::Retrieve:
-            return "retrieve";
-        case fdb5::ControlIdentifier::Archive:
-            return "archive";
-        case fdb5::ControlIdentifier::Wipe:
-            return "wipe";
-        case fdb5::ControlIdentifier::UniqueRoot:
-            return "uniqueRoot";
-        default:
-            return "unknown";
-    }
-}
-
-/// Convert string to ControlIdentifier enum
-static fdb5::ControlIdentifier control_identifier_from_string(const std::string& s) {
-    if (s == "list") {
-        return fdb5::ControlIdentifier::List;
-    }
-    if (s == "retrieve") {
-        return fdb5::ControlIdentifier::Retrieve;
-    }
-    if (s == "archive") {
-        return fdb5::ControlIdentifier::Archive;
-    }
-    if (s == "wipe") {
-        return fdb5::ControlIdentifier::Wipe;
-    }
-    if (s == "uniqueRoot") {
-        return fdb5::ControlIdentifier::UniqueRoot;
-    }
-    return fdb5::ControlIdentifier::None;
-}
-
 // ============================================================================
 // FdbHandle implementation
 // ============================================================================
@@ -200,10 +162,8 @@ FdbStatsData FdbHandle::stats() const {
     return data;
 }
 
-bool FdbHandle::enabled(rust::Str identifier) const {
-    std::string id_str{identifier};
-    auto ctrl_id = control_identifier_from_string(id_str);
-    return impl_.enabled(ctrl_id);
+bool FdbHandle::enabled(fdb5::ControlIdentifier identifier) const {
+    return impl_.enabled(identifier);
 }
 
 rust::String FdbHandle::id() const {
@@ -607,7 +567,7 @@ ControlElementData ControlIteratorHandle::next() {
     ControlElementData data;
     data.location = rust::String(current_.location.asString());
     for (const auto& id : current_.controlIdentifiers) {
-        data.identifiers.push_back(rust::String(control_identifier_to_string(id)));
+        data.identifiers.push_back(id);
     }
     return data;
 }
@@ -889,14 +849,13 @@ std::unique_ptr<StatsIteratorHandle> stats_iterator(FdbHandle& handle, rust::Str
 // ============================================================================
 
 std::unique_ptr<ControlIteratorHandle> control(FdbHandle& handle, rust::Str request, fdb5::ControlAction action,
-                                               const rust::Vec<rust::String>& identifiers) {
+                                               rust::Slice<const fdb5::ControlIdentifier> identifiers) {
     std::string request_str{request};
     auto tool_request = make_tool_request(request_str);
 
-    // Parse control identifiers using |= operator
     fdb5::ControlIdentifiers ctrl_ids;
-    for (const auto& id : identifiers) {
-        ctrl_ids |= control_identifier_from_string(std::string(id));
+    for (auto id : identifiers) {
+        ctrl_ids |= id;
     }
 
     auto it = handle.inner().control(tool_request, action, ctrl_ids);

rust/crates/fdb-sys/cpp/fdb_bridge.h

@@ -130,7 +130,7 @@ class FdbHandle {
     FdbStatsData stats() const;
 
     /// Check if a control identifier is enabled.
-    bool enabled(rust::Str identifier) const;
+    bool enabled(fdb5::ControlIdentifier identifier) const;
 
     /// Get the FDB configuration ID.
     rust::String id() const;
@@ -535,7 +535,7 @@ std::unique_ptr<StatsIteratorHandle> stats_iterator(FdbHandle& handle, rust::Str
 
 /// Control database features.
 std::unique_ptr<ControlIteratorHandle> control(FdbHandle& handle, rust::Str request, fdb5::ControlAction action,
-                                               const rust::Vec<rust::String>& identifiers);
+                                               rust::Slice<const fdb5::ControlIdentifier> identifiers);
 
 // ============================================================================
 // Move functions

rust/crates/fdb-sys/src/lib.rs

@@ -164,8 +164,8 @@ mod ffi {
     pub struct ControlElementData {
         /// Location
         pub location: String,
-        /// Control identifiers
-        pub identifiers: Vec<String>,
+        /// Control identifiers (each variant is the same as `fdb5::ControlIdentifier`).
+        pub identifiers: Vec<ControlIdentifier>,
     }
 
     /// Result from move iteration.
@@ -186,7 +186,7 @@ mod ffi {
         pub config_path: String,
     }
 
-    // Bind to existing fdb5::ControlAction C++ enum.
+    // Bind to existing fdb5::ControlAction / fdb5::ControlIdentifier C++ enums.
     // The shared enum + extern type pattern tells CXX to use the existing
     // C++ enum and generate static assertions to verify the values match.
     /// Control action for database features.
@@ -201,10 +201,25 @@ mod ffi {
         Enable = 2,
     }
 
+    /// Feature identifier for `control()` operations. Bitflag values match
+    /// `fdb5::ControlIdentifier` exactly.
+    #[namespace = "fdb5"]
+    #[repr(u16)]
+    #[derive(Debug)]
+    pub enum ControlIdentifier {
+        None = 0,
+        List = 1,
+        Retrieve = 2,
+        Archive = 4,
+        Wipe = 8,
+        UniqueRoot = 16,
+    }
+
     #[namespace = "fdb5"]
     unsafe extern "C++" {
         include!("fdb5/api/helpers/ControlIterator.h");
         type ControlAction;
+        type ControlIdentifier;
     }
 
     // =========================================================================
@@ -231,7 +246,7 @@ mod ffi {
         fn stats(self: &FdbHandle) -> FdbStatsData;
 
         /// Check if a control identifier is enabled.
-        fn enabled(self: &FdbHandle, identifier: &str) -> bool;
+        fn enabled(self: &FdbHandle, identifier: ControlIdentifier) -> bool;
 
         /// Get the FDB configuration ID.
         fn id(self: &FdbHandle) -> String;
@@ -563,7 +578,7 @@ mod ffi {
             handle: Pin<&mut FdbHandle>,
             request: &str,
             action: ControlAction,
-            identifiers: &Vec<String>,
+            identifiers: &[ControlIdentifier],
         ) -> Result<UniquePtr<ControlIteratorHandle>>;
 
         // =====================================================================

rust/crates/fdb/build.rs

@@ -1,7 +1,7 @@
 //! Build script for fdb crate.
 //!
 //! Emits RPATH linker flags so binaries can find dynamic libraries
-//! at runtime without setting LD_LIBRARY_PATH/DYLD_LIBRARY_PATH.
+//! at runtime without setting `LD_LIBRARY_PATH`/`DYLD_LIBRARY_PATH`.
 
 fn main() {
     println!("cargo:rerun-if-changed=build.rs");

rust/crates/fdb/examples/fdb_basic.rs

@@ -2,7 +2,7 @@
 //!
 //! Run with: `cargo run --example fdb_basic -p fdb`
 
-use fdb::Fdb;
+use fdb::{ControlIdentifier, Fdb};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Print version info (works without FDB config)
@@ -17,9 +17,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Check capabilities
     println!("\nCapabilities:");
-    println!("  retrieve enabled: {}", fdb.enabled("retrieve"));
-    println!("  archive enabled: {}", fdb.enabled("archive"));
-    println!("  list enabled: {}", fdb.enabled("list"));
+    println!(
+        "  retrieve enabled: {}",
+        fdb.enabled(ControlIdentifier::Retrieve)
+    );
+    println!(
+        "  archive enabled: {}",
+        fdb.enabled(ControlIdentifier::Archive)
+    );
+    println!("  list enabled: {}", fdb.enabled(ControlIdentifier::List));
 
     Ok(())
 }

rust/crates/fdb/src/datareader.rs

@@ -97,7 +97,7 @@ impl Seek for DataReader {
                 if new < 0 {
                     return Err(std::io::Error::other("seek to negative position"));
                 }
-                new as u64
+                new.cast_unsigned()
             }
             SeekFrom::Current(offset) => {
                 let current = i64::try_from(self.tell())
@@ -108,7 +108,7 @@ impl Seek for DataReader {
                 if new < 0 {
                     return Err(std::io::Error::other("seek to negative position"));
                 }
-                new as u64
+                new.cast_unsigned()
             }
         };
 

rust/crates/fdb/src/handle.rs

@@ -3,8 +3,8 @@
 use std::collections::HashMap;
 use std::sync::Once;
 
-use fdb_sys::ControlAction;
 use fdb_sys::UniquePtr;
+use fdb_sys::{ControlAction, ControlIdentifier};
 use parking_lot::Mutex;
 
 use crate::datareader::DataReader;
@@ -433,7 +433,8 @@ impl Fdb {
     ///
     /// * `request` - The request specifying which databases to control
     /// * `action` - The action to perform
-    /// * `identifiers` - The feature identifiers to control (e.g., "retrieve", "archive")
+    /// * `identifiers` - The feature identifiers to control (e.g.
+    ///   `ControlIdentifier::Retrieve`, `ControlIdentifier::Archive`)
     ///
     /// # Errors
     ///
@@ -442,11 +443,11 @@ impl Fdb {
         &self,
         request: &Request,
         action: ControlAction,
-        identifiers: &[String],
+        identifiers: &[ControlIdentifier],
     ) -> Result<ControlIterator> {
-        let ids: Vec<String> = identifiers.to_vec();
-        let it =
-            self.with_handle(|h| fdb_sys::control(h, &request.to_request_string(), action, &ids))?;
+        let it = self.with_handle(|h| {
+            fdb_sys::control(h, &request.to_request_string(), action, identifiers)
+        })?;
         Ok(ControlIterator::new(it))
     }
 
@@ -469,9 +470,10 @@ impl Fdb {
     ///
     /// # Arguments
     ///
-    /// * `identifier` - The identifier to check (e.g., "retrieve", "archive")
+    /// * `identifier` - The identifier to check (e.g.
+    ///   `ControlIdentifier::Retrieve`, `ControlIdentifier::Archive`)
     #[must_use]
-    pub fn enabled(&self, identifier: &str) -> bool {
+    pub fn enabled(&self, identifier: ControlIdentifier) -> bool {
         self.with_handle_ref(|h| h.enabled(identifier))
     }
 

rust/crates/fdb/src/iterator.rs

@@ -608,8 +608,8 @@ unsafe impl Send for ControlIterator {}
 pub struct ControlElement {
     /// Location of the database.
     pub location: String,
-    /// Control identifiers (e.g., "retrieve", "archive").
-    pub identifiers: Vec<String>,
+    /// Control identifiers enabled for this database.
+    pub identifiers: Vec<fdb_sys::ControlIdentifier>,
 }
 
 // =============================================================================