Make BindgenOptions pub(crate)

Author: pepyakin

src/ir/context.rs

@@ -321,7 +321,7 @@ fn find_effective_target(clang_args: &[String]) -> (String, bool) {
 
 impl BindgenContext {
     /// Construct the context for the given `options`.
-    pub fn new(options: BindgenOptions) -> Self {
+    pub(crate) fn new(options: BindgenOptions) -> Self {
         use clang_sys;
 
         // TODO(emilio): Use the CXTargetInfo here when available.
@@ -1795,7 +1795,7 @@ impl BindgenContext {
     }
 
     /// Get the options used to configure this bindgen context.
-    pub fn options(&self) -> &BindgenOptions {
+    pub(crate) fn options(&self) -> &BindgenOptions {
         &self.options
     }
 

src/lib.rs

@@ -7,9 +7,6 @@
 #![deny(missing_docs)]
 #![deny(warnings)]
 #![deny(unused_extern_crates)]
-// We internally use the deprecated BindgenOptions all over the place. Once we
-// remove its `pub` declaration, we can un-deprecate it and remove this pragma.
-#![allow(deprecated)]
 // To avoid rather annoying warnings when matching with CXCursor_xxx as a
 // constant.
 #![allow(non_upper_case_globals)]
@@ -1101,11 +1098,8 @@ impl Builder {
 }
 
 /// Configuration options for generated bindings.
-///
-/// Deprecated: use a `Builder` instead.
 #[derive(Debug)]
-#[deprecated]
-pub struct BindgenOptions {
+pub(crate) struct BindgenOptions {
     /// The set of types that have been blacklisted and should not appear
     /// anywhere in the generated code.
     pub blacklisted_types: RegexSet,
@@ -1299,11 +1293,6 @@ impl BindgenOptions {
         self.rust_features = rust_target.into();
     }
 
-    /// Get target Rust version
-    pub fn rust_target(&self) -> RustTarget {
-        self.rust_target
-    }
-
     /// Get features supported by target Rust version
     pub fn rust_features(&self) -> RustFeatures {
         self.rust_features
@@ -1408,10 +1397,7 @@ pub struct Bindings {
 
 impl Bindings {
     /// Generate bindings for the given options.
-    ///
-    /// Deprecated - use a `Builder` instead
-    #[deprecated]
-    pub fn generate(
+    pub(crate) fn generate(
         mut options: BindgenOptions,
     ) -> Result<Bindings, ()> {
         ensure_libclang_is_loaded();
@@ -1737,8 +1723,8 @@ fn commandline_flag_unit_test_function() {
     //Test 2
     let bindings = ::builder()
         .header("input_header")
-        .whitelisted_type("Distinct_Type")
-        .whitelisted_function("safe_function");
+        .whitelist_type("Distinct_Type")
+        .whitelist_function("safe_function");
 
     let command_line_flags = bindings.command_line_flags();
     let test_cases = vec![

src/regex_set.rs

@@ -18,17 +18,6 @@ impl RegexSet {
         self.items.is_empty()
     }
 
-    /// Extend this set with every regex in the iterator.
-    pub fn extend<I, S>(&mut self, iter: I)
-    where
-        I: IntoIterator<Item = S>,
-        S: AsRef<str>,
-    {
-        for s in iter.into_iter() {
-            self.insert(s)
-        }
-    }
-
     /// Insert a new regex into this set.
     pub fn insert<S>(&mut self, string: S)
     where
@@ -42,10 +31,6 @@ impl RegexSet {
     pub fn get_items(&self) -> &[String] {
         &self.items[..]
     }
-    /// Returns reference of its field 'set'
-    pub fn get_set(&self) -> Option<&RxSet> {
-        self.set.as_ref()
-    }
 
     /// Construct a RegexSet from the set of entries we've accumulated.
     ///