diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-09-14 11:11:56 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-14 11:11:56 -0500 |
commit | f6002ab064bc0690fa69d2a05c94b34bfc6fd2c6 (patch) | |
tree | a9abf0ae397a0bf2348eab7c3fe2b3daaed56252 /src | |
parent | b349cf7ea033e5f43334b804b67010d401874a52 (diff) | |
parent | 2c86445a61f1725103f93771345a63a548974b91 (diff) |
Auto merge of #989 - aeleos:master, r=fitzgen
Make whitelisted_var consistant with CLI flags
Closes #986
This is my first time contributing to rust so hopefully I did everything right, otherwise let me know.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib.rs | 11 | ||||
-rw-r--r-- | src/options.rs | 2 |
2 files changed, 11 insertions, 2 deletions
@@ -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. /// diff --git a/src/options.rs b/src/options.rs index 383a8899..30c10157 100644 --- a/src/options.rs +++ b/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); } } |