s/deduplicate/merge/g

Author: pvdrz

src/lib.rs

@@ -592,8 +592,8 @@ impl Builder {
             output_vector.push("--sort-semantically".into());
         }
 
-        if self.options.deduplicate_extern_blocks {
-            output_vector.push("--deduplicate-extern-blocks".into());
+        if self.options.merge_extern_blocks {
+            output_vector.push("--merge-extern-blocks".into());
         }
 
         // Add clang arguments
@@ -1493,9 +1493,9 @@ impl Builder {
         self
     }
 
-    /// If true, deduplicates extern blocks.
-    pub fn deduplicate_extern_blocks(mut self, doit: bool) -> Self {
-        self.options.deduplicate_extern_blocks = doit;
+    /// If true, merges extern blocks.
+    pub fn merge_extern_blocks(mut self, doit: bool) -> Self {
+        self.options.merge_extern_blocks = doit;
         self
     }
 
@@ -2033,7 +2033,7 @@ struct BindgenOptions {
     sort_semantically: bool,
 
     /// Deduplicate `extern` blocks.
-    deduplicate_extern_blocks: bool,
+    merge_extern_blocks: bool,
 }
 
 /// TODO(emilio): This is sort of a lie (see the error message that results from
@@ -2044,7 +2044,7 @@ impl ::std::panic::UnwindSafe for BindgenOptions {}
 impl BindgenOptions {
     /// Whether any of the enabled options requires `syn`.
     fn require_syn(&self) -> bool {
-        self.sort_semantically || self.deduplicate_extern_blocks
+        self.sort_semantically || self.merge_extern_blocks
     }
 
     fn build(&mut self) {
@@ -2188,7 +2188,7 @@ impl Default for BindgenOptions {
             force_explicit_padding: false,
             vtable_generation: false,
             sort_semantically: false,
-            deduplicate_extern_blocks: false,
+            merge_extern_blocks: false,
         }
     }
 }
@@ -2494,7 +2494,7 @@ impl Bindings {
                     .unwrap()
                     .1;
 
-            if options.deduplicate_extern_blocks {
+            if options.merge_extern_blocks {
                 // Here we will store all the items after deduplication.
                 let mut items = Vec::new();
 

src/options.rs

@@ -518,8 +518,8 @@ where
             Arg::new("sort-semantically")
                 .long("sort-semantically")
                 .help("Enables sorting of code generation in a predefined manner."),
-            Arg::new("deduplicate-extern-blocks")
-                .long("deduplicate-extern-blocks")
+            Arg::new("merge-extern-blocks")
+                .long("merge-extern-blocks")
                 .help("Deduplicates extern blocks."),
             Arg::new("V")
                 .long("version")
@@ -1010,8 +1010,8 @@ where
         builder = builder.sort_semantically(true);
     }
 
-    if matches.is_present("deduplicate-extern-blocks") {
-        builder = builder.deduplicate_extern_blocks(true);
+    if matches.is_present("merge-extern-blocks") {
+        builder = builder.merge_extern_blocks(true);
     }
 
     Ok((builder, output, verbose))

tests/expectations/tests/deduplicate-extern-blocks.rs renamed to tests/expectations/tests/merge-extern-blocks.rs

@@ -0,0 +1,6 @@
+// bindgen-flags: --merge-extern-blocks -- --target=x86_64-unknown-linux
+int foo();
+typedef struct Point {
+    int x;
+} Point;
+int bar();