5 files changed, 4 insertions, 18 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index a5159c98..5688065f 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -41,7 +41,7 @@ struct CodegenResult {
     /// The set of generated function/var names, needed because in C/C++ is legal to
     /// do something like:
     ///
-    /// ```
+    /// ```c++
     /// extern "C" {
     ///   void foo();
     ///   extern int bar;
diff --git a/src/ir/annotations.rs b/src/ir/annotations.rs
index cc61dbfd..64ab255d 100644
--- a/src/ir/annotations.rs
+++ b/src/ir/annotations.rs
@@ -87,7 +87,7 @@ impl Annotations {
     ///
     /// the generated code would look something like:
     ///
-    /// ```rust
+    /// ```c++
     /// /** <div rustbindgen replaces="Bar"></div> */
     /// struct Bar {
     ///     int x;
diff --git a/src/ir/context.rs b/src/ir/context.rs
index e6659697..da5f334f 100644
--- a/src/ir/context.rs
+++ b/src/ir/context.rs
@@ -421,7 +421,7 @@ impl<'ctx> BindgenContext<'ctx> {
     ///
     /// To see an example of what this handles:
     ///
-    /// ```
+    /// ```c++
     ///     template<typename T>
     ///     class Incomplete {
     ///       T p;
diff --git a/src/ir/item.rs b/src/ir/item.rs
index 5b6297bd..4808806b 100644
--- a/src/ir/item.rs
+++ b/src/ir/item.rs
@@ -28,7 +28,7 @@ pub trait ItemCanonicalName {
 ///
 /// To contrast with canonical_name, here's an example:
 ///
-/// ```
+/// ```c++
 /// namespace foo {
 ///     const BAR = 3;
 /// }
diff --git a/src/lib.rs b/src/lib.rs
index 64dba22c..44cadb4d 100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -294,20 +294,6 @@ impl Bindings {
     }
 }
 
-#[test]
-fn builder_state() {
-    let logger = DummyLogger;
-    let mut build = builder();
-    {
-        build.header("example.h");
-        build.link_static("m");
-        build.log(&logger);
-    }
-    assert!(build.logger.is_some());
-    assert!(build.options.clang_args.binary_search(&"example.h".to_owned()).is_ok());
-    assert!(build.options.links.binary_search(&("m".to_owned(), LinkType::Static)).is_ok());
-}
-
 /// Determines whether the given cursor is in any of the files matched by the
 /// options.
 fn filter_builtins(ctx: &BindgenContext, cursor: &clang::Cursor) -> bool {