Demonstrate dropping support for libclang < 5.0

.github/workflows/bindgen.yml

@@ -99,7 +99,7 @@ jobs:
           - debian: null
             cross: null
             rust: null
-        llvm_version: ["4.0", "5.0", "9.0"]
+        llvm_version: ["5.0", "9.0"]
         main_tests: [1]
         release_build: [0, 1]
         no_default_features: [0, 1]
@@ -109,14 +109,6 @@ jobs:
         feature_extra_asserts: [0]
         feature_testing_only_docs: [0]
 
-        exclude:
-          # 4.0 is too old to support regular dynamic linking, so this
-          # is not expected to work.
-          - os: ubuntu-latest
-            llvm_version: "4.0"
-            no_default_features: 1
-            feature_runtime: 0
-
         include:
           # Test with extra asserts + docs just with latest llvm versions to
           # prevent explosion

Cargo.toml

@@ -83,4 +83,3 @@ testing_only_docs = []
 testing_only_extra_assertions = []
 testing_only_libclang_9 = []
 testing_only_libclang_5 = []
-testing_only_libclang_4 = []

appveyor.yml

@@ -2,18 +2,12 @@ environment:
   RUST_BACKTRACE: 1
   RUST_CHANNEL: "%Configuration%"
   matrix:
-  - TARGET: gnu
-    LLVM_VERSION: 4.0.0-1
-    BINDGEN_FEATURES: testing_only_libclang_4
   - TARGET: gnu
     LLVM_VERSION: 5.0.0-1
     BINDGEN_FEATURES: testing_only_libclang_5
   - TARGET: gnu
     LLVM_VERSION: 9.0.0-1
     BINDGEN_FEATURES: testing_only_libclang_9
-  - TARGET: msvc
-    LLVM_VERSION: 4.0.0
-    BINDGEN_FEATURES: testing_only_libclang_4
   - TARGET: msvc
     LLVM_VERSION: 5.0.0
     BINDGEN_FEATURES: testing_only_libclang_5

bindgen-integration/Cargo.toml

@@ -18,4 +18,3 @@ testing_only_docs = ["bindgen/testing_only_docs"]
 testing_only_extra_assertions = ["bindgen/testing_only_extra_assertions"]
 testing_only_libclang_9 = ["bindgen/testing_only_libclang_9"]
 testing_only_libclang_5 = ["bindgen/testing_only_libclang_5"]
-testing_only_libclang_4 = ["bindgen/testing_only_libclang_4"]

src/clang.rs

@@ -2065,10 +2065,7 @@ pub struct TargetInfo {
 
 impl TargetInfo {
     /// Tries to obtain target information from libclang.
-    pub fn new(tu: &TranslationUnit) -> Option<Self> {
-        if !clang_getTranslationUnitTargetInfo::is_loaded() {
-            return None;
-        }
+    pub fn new(tu: &TranslationUnit) -> Self {
         let triple;
         let pointer_width;
         unsafe {
@@ -2079,9 +2076,9 @@ impl TargetInfo {
         }
         assert!(pointer_width > 0);
         assert_eq!(pointer_width % 8, 0);
-        Some(TargetInfo {
+        TargetInfo {
             triple,
             pointer_width: pointer_width as usize,
-        })
+        }
     }
 }

src/ir/context.rs

@@ -368,7 +368,7 @@ pub struct BindgenContext {
     translation_unit: clang::TranslationUnit,
 
     /// Target information that can be useful for some stuff.
-    target_info: Option<clang::TargetInfo>,
+    target_info: clang::TargetInfo,
 
     /// The options given by the user via cli or other medium.
     options: BindgenOptions,
@@ -584,10 +584,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
 
     /// Returns `true` if the target architecture is wasm32
     pub fn is_target_wasm32(&self) -> bool {
-        match self.target_info {
-            Some(ref ti) => ti.triple.starts_with("wasm32-"),
-            None => false,
-        }
+        self.target_info.triple.starts_with("wasm32-")
     }
 
     /// Creates a timer for the current bindgen phase. If time_phases is `true`,
@@ -600,10 +597,7 @@ If you encounter an error missing from this list, please file an issue or a PR!"
     /// Returns the pointer width to use for the target for the current
     /// translation.
     pub fn target_pointer_size(&self) -> usize {
-        if let Some(ref ti) = self.target_info {
-            return ti.pointer_width / 8;
-        }
-        mem::size_of::<*mut ()>()
+        return self.target_info.pointer_width / 8;
     }
 
     /// Get the stack of partially parsed types that we are in the middle of

src/main.rs

@@ -23,8 +23,6 @@ fn clang_version_check() {
         Some((9, 0))
     } else if cfg!(feature = "testing_only_libclang_5") {
         Some((5, 0))
-    } else if cfg!(feature = "testing_only_libclang_4") {
-        Some((4, 0))
     } else {
         None
     };

tests/expectations/build.rs

@@ -9,7 +9,6 @@ use std::io::Write;
 use std::path::Path;
 
 const LIBCLANG_VERSION_DIRS: &'static [&'static str] = &[
-    "libclang-4",
     "libclang-5",
     "libclang-9",
 ];