Auto merge of #324 - emilio:coherent-replacement-and-whitelisting, r=fitzgen

ir: Fix namespace_aware_canonical_name with disable_name_namespacing.

This dropped off the previous PR.

Author: bors-servo

libbindgen/src/ir/item.rs

@@ -1235,10 +1235,14 @@ impl ItemCanonicalPath for Item {
     fn namespace_aware_canonical_path(&self,
                                       ctx: &BindgenContext)
                                       -> Vec<String> {
+        let path = self.canonical_path(ctx);
         if ctx.options().enable_cxx_namespaces {
-            return self.canonical_path(ctx);
+            return path;
         }
-        return vec![self.canonical_path(ctx)[1..].join("_")];
+        if ctx.options().disable_name_namespacing {
+            return vec![path.last().unwrap().clone()];
+        }
+        return vec![path[1..].join("_")];
     }
 
     fn canonical_path(&self, ctx: &BindgenContext) -> Vec<String> {

libbindgen/tests/expectations/tests/canonical_path_without_namespacing.rs

@@ -0,0 +1,23 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct Bar {
+    pub _address: u8,
+}
+#[test]
+fn bindgen_test_layout_Bar() {
+    assert_eq!(::std::mem::size_of::<Bar>() , 1usize);
+    assert_eq!(::std::mem::align_of::<Bar>() , 1usize);
+}
+impl Clone for Bar {
+    fn clone(&self) -> Self { *self }
+}
+extern "C" {
+    #[link_name = "_Z3bazPN3foo3BarE"]
+    pub fn baz(arg1: *mut Bar);
+}

libbindgen/tests/headers/canonical_path_without_namespacing.hpp

@@ -0,0 +1,7 @@
+// bindgen-flags: --disable-name-namespacing
+
+namespace foo {
+  struct Bar {};
+}
+
+void baz(foo::Bar*);