From 51ff49ae6366163b78d197db6b8f454c03d5733f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 29 Jun 2020 03:33:06 +0200
Subject: [PATCH] tests: Minor simplification of test harness.

We were never returning Ok(None), so not sure why this was ever there.
---
 tests/tests.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/tests.rs b/tests/tests.rs
index 2f8cdea94b..a85803c3b9 100644
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -247,7 +247,7 @@ fn builder() -> Builder {
     bindgen::builder().disable_header_comment()
 }
 
-fn create_bindgen_builder(header: &PathBuf) -> Result<Option<Builder>, Error> {
+fn create_bindgen_builder(header: &PathBuf) -> Result<Builder, Error> {
     #[cfg(feature = "logging")]
     let _ = env_logger::try_init();
 
@@ -319,7 +319,7 @@ fn create_bindgen_builder(header: &PathBuf) -> Result<Option<Builder>, Error> {
         .map(ToString::to_string)
         .chain(flags.into_iter());
 
-    builder_from_flags(args).map(|(builder, _, _)| Some(builder))
+    builder_from_flags(args).map(|(builder, _, _)| builder)
 }
 
 macro_rules! test_header {
@@ -328,11 +328,7 @@ macro_rules! test_header {
         fn $function() {
             let header = PathBuf::from($header);
             let result = create_bindgen_builder(&header).and_then(|builder| {
-                if let Some(builder) = builder {
-                    compare_generated_header(&header, builder)
-                } else {
-                    Ok(())
-                }
+                compare_generated_header(&header, builder)
             });
 
             if let Err(err) = result {