Auto merge of rust-lang#989 - aeleos:master, r=fitzgen

Make whitelisted_var consistant with CLI flags

Closes rust-lang#986

This is my first time contributing to rust so hopefully I did everything right, otherwise let me know.

Author: bors-servo

src/lib.rs

@@ -651,11 +651,20 @@ impl Builder {
     /// Whitelist the given variable so that it (and all types that it
     /// transitively refers to) appears in the generated bindings. Regular
     /// expressions are supported.
-    pub fn whitelisted_var<T: AsRef<str>>(mut self, arg: T) -> Builder {
+    pub fn whitelist_var<T: AsRef<str>>(mut self, arg: T) -> Builder {
         self.options.whitelisted_vars.insert(arg);
         self
     }
 
+    /// Whitelist the given variable.
+    ///
+    /// Deprecated: use whitelist_var instead.
+    #[deprecated = "use whitelist_var instead"]
+    pub fn whitelisted_var<T: AsRef<str>>(self, arg: T) -> Builder {
+        self.whitelist_var(arg)
+    }
+
+
     /// Mark the given enum (or set of enums, if using a pattern) as being
     /// bitfield-like. Regular expressions are supported.
     ///

src/options.rs

@@ -485,7 +485,7 @@ where
 
     if let Some(whitelist) = matches.values_of("whitelist-var") {
         for regex in whitelist {
-            builder = builder.whitelisted_var(regex);
+            builder = builder.whitelist_var(regex);
         }
     }