fix issues resulting from merge conflict resolution in libsqlite3-sys…

…/build.rs

libsqlite3-sys/Cargo.toml

@@ -45,11 +45,9 @@ openssl-sys = { version = "0.9", optional = true }
 
 [build-dependencies]
 bindgen = { version = "0.59", optional = true, default-features = false, features = ["runtime"] }
-pkg-config = { version = "0.3.19", optional = true }
 cc = { version = "1.0", optional = true }
-syn = { version = "1.0", features = ["extra-traits", "full", "printing"], optional = true }
+pkg-config = { version = "0.3.19", optional = true }
 quote = { version = "1.0", optional = true }
-which = { version = "4.0.2", optional = true }
-
-[target.'cfg(target_env = "msvc")'.build-dependencies]
+syn = { version = "1.0", features = ["extra-traits", "full", "printing"], optional = true }
 vcpkg = { version = "0.2", optional = true }
+which = { version = "4.0.2", optional = true }

libsqlite3-sys/build.rs

@@ -48,11 +48,9 @@ fn main() {
                 or 'bundled-sqlcipher-vendored-openssl' to also bundle OpenSSL crypto."
             )
         }
-        build_linked::main(&out_dir, &out_path);
-        return;
+        build_linked::main(&out_dir, &out_path)
     } else if cfg!(feature = "loadable_extension") {
-        build_loadable_extension::main(&out_dir, &out_path);
-        return;
+        build_loadable_extension::main(&out_dir, &out_path)
     } else if cfg!(feature = "bundled")
         || (win_target() && cfg!(feature = "bundled-windows"))
         || cfg!(feature = "bundled-sqlcipher")
@@ -96,7 +94,8 @@ mod build_bundled {
         #[cfg(feature = "buildtime_bindgen")]
         {
             use super::{bindings, header_file, HeaderLocation};
-            let header = HeaderLocation::FromPath(format!("{}/{}", lib_name, header_file()));
+            let header_path = format!("{}/{}", lib_name, header_file());
+            let header = HeaderLocation::FromPath(header_path);
             bindings::write_to_out_dir(header, out_path);
             println!("cargo:rerun-if-changed={}", header_path);
         }
@@ -332,8 +331,10 @@ fn wrapper_file() -> &'static str {
         "wrapper-ext.h"
     } else {
         "wrapper.h"
+    }
+}
 
-        fn lib_name() -> &'static str {
+fn lib_name() -> &'static str {
     if cfg!(any(feature = "sqlcipher", feature = "bundled-sqlcipher")) {
         "sqlcipher"
     } else if cfg!(all(windows, feature = "winsqlite3")) {