adressing more feedback

Author: ZuseZ4

compiler/rustc_codegen_llvm/src/builder/autodiff.rs

@@ -246,7 +246,7 @@ fn generate_enzyme_call<'ll, 'tcx>(
         // FIXME(ZuseZ4): Work with Enzyme core devs to clarify what debug metadata issues we have,
         // and how to best improve it for enzyme core and rust-enzyme.
         let md_ty = cx.get_md_kind_id("dbg");
-        if llvm::LLVMRustHasMetadata(last_inst, md_ty) == True {
+        if llvm::LLVMRustHasMetadata(last_inst, md_ty) {
             let md = llvm::LLVMRustDIGetInstMetadata(last_inst)
                 .expect("failed to get instruction metadata");
             let md_todiff = cx.get_metadata_value(md);

compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs

@@ -3,30 +3,22 @@
 use libc::{c_char, c_uint};
 
 use super::Bool;
-use super::ffi::{Attribute, BasicBlock, Builder, Metadata, Module, Type, Value};
+use super::ffi::{Attribute, BasicBlock, Metadata, Module, Type, Value};
 extern "C" {
     // Enzyme
-    pub fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> Bool;
+    pub fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> bool;
     pub fn LLVMRustEraseInstBefore(BB: &BasicBlock, I: &Value);
     pub fn LLVMRustGetLastInstruction<'a>(BB: &BasicBlock) -> Option<&'a Value>;
     pub fn LLVMRustDIGetInstMetadata(I: &Value) -> Option<&Metadata>;
     pub fn LLVMRustEraseInstFromParent(V: &Value);
     pub fn LLVMRustGetTerminator<'a>(B: &BasicBlock) -> &'a Value;
-    pub fn LLVMGetFunctionCallConv(F: &Value) -> c_uint;
 
+    pub fn LLVMGetFunctionCallConv(F: &Value) -> c_uint;
     pub fn LLVMGetReturnType(T: &Type) -> &Type;
     pub fn LLVMDumpModule(M: &Module);
     pub fn LLVMCountStructElementTypes(T: &Type) -> c_uint;
     pub fn LLVMVerifyFunction(V: &Value, action: LLVMVerifierFailureAction) -> Bool;
     pub fn LLVMGetParams(Fnc: &Value, parms: *mut &Value);
-    pub fn LLVMBuildCall2<'a>(
-        arg1: &Builder<'a>,
-        ty: &Type,
-        func: &Value,
-        args: *const &Value,
-        num_args: usize,
-        name: *const c_char,
-    ) -> &'a Value;
     pub fn LLVMGetNamedFunction(M: &Module, Name: *const c_char) -> Option<&Value>;
     pub fn LLVMIsEnumAttribute(A: &Attribute) -> Bool;
     pub fn LLVMIsStringAttribute(A: &Attribute) -> Bool;