Merge branch 'master' of https://github.com/denzp/rustc-llvm-proxy into ir_reader_impl

Author: jdtatz

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustc-llvm-proxy"
-version = "0.1.6"
+version = "0.1.8"
 authors = ["Denys Zariaiev <[email protected]>"]
 license = "MIT"
 
@@ -20,7 +20,7 @@ libloading = "0.5"
 lazy_static = "1.0"
 failure = "0.1"
 libc = "0.2"
-llvm-sys = { version = "70", features = ["no-llvm-linking"] }
+llvm-sys = { version = "70", features = ["no-llvm-linking", "disable-alltargets-init"] }
 
 [build-dependencies]
 cargo_metadata = "0.6"

README.md

@@ -21,7 +21,7 @@ In case you are using `llvm-sys`, this can be achieved with a special feature:
 ``` toml
 [dependencies.llvm-sys]
 version = "60"
-features = ["no-llvm-linking"]
+features = ["no-llvm-linking", "disable-alltargets-init"]
 ```
 
 Then all you need to do is to include the crate into your project:

build.rs

@@ -12,8 +12,16 @@ use std::env;
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
 
+    // Dummy declarations for RLS.
+    if std::env::var("CARGO").unwrap_or_default().ends_with("rls") {
+        llvm::Generator::default()
+            .write_declarations(&format!("{}/llvm_gen.rs", out_dir))
+            .expect("Unable to write generated LLVM declarations");
+
+        return;
+    }
+
     println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-changed={}/llvm_gen.rs", out_dir);
 
     llvm::Generator::default()
         .parse_llvm_sys_crate()

src/lib.rs

@@ -1,5 +1,5 @@
 #![deny(warnings)]
-#![allow(non_snake_case)]
+#![allow(non_snake_case, unused_imports, unused_macros)]
 
 //! Dynamically proxy LLVM calls into Rust own shared library! 🎉
 //!

src/path.rs

@@ -7,7 +7,7 @@ use failure::Error;
 pub fn find_lib_path() -> Result<PathBuf, Error> {
     let paths = collect_possible_paths()?;
 
-    if paths.len() == 0 {
+    if paths.is_empty() {
         bail!("Unable to find possible LLVM shared lib locations.");
     }
 
@@ -40,7 +40,7 @@ fn collect_possible_paths() -> Result<Vec<PathBuf>, Error> {
 
     // Special case: find the location for Rust built from sources.
     if let Ok(env_path) = env::var("PATH") {
-        for item in env_path.split(":") {
+        for item in env_path.split(':') {
             let mut rustc_path = PathBuf::from(item);
 
             rustc_path.pop();
@@ -65,7 +65,7 @@ fn collect_possible_paths() -> Result<Vec<PathBuf>, Error> {
     }
 
     if let Ok(lib_paths) = env::var("LD_LIBRARY_PATH") {
-        for item in lib_paths.split(":") {
+        for item in lib_paths.split(':') {
             let mut possible_path = PathBuf::from(item);
             possible_path.pop();
 
@@ -140,7 +140,17 @@ fn collect_possible_paths() -> Result<Vec<PathBuf>, Error> {
 // Fails if using nightly build from a specific date
 // e.g. nightly-2018-11-30-x86_64-unknown-linux-gnu
 fn extract_arch(toolchain: &str) -> String {
-    toolchain.split('-').skip(1).collect::<Vec<_>>().join("-")
+    toolchain
+        .split('-')
+        // Skip `nightly` rust version prefix.
+        .skip(1)
+        // Also skip rust version specification if exists.
+        .skip_while(|item| match item.chars().next() {
+            None | Some('0'...'9') => true,
+            _ => false,
+        })
+        .collect::<Vec<_>>()
+        .join("-")
 }
 
 fn find_rustc() -> Option<PathBuf> {

tests/llvm-api.rs

@@ -7,14 +7,11 @@ use std::ffi::{CStr, CString};
 #[test]
 fn module_creation() {
     unsafe {
-        let module = LLVMModuleCreateWithName(CString::new("test module").unwrap().as_ptr());
+        let module_name = CString::new("test module").unwrap();
+        let module = LLVMModuleCreateWithName(module_name.as_ptr());
 
-        LLVMSetDataLayout(
-            module,
-            CString::new("e-i64:64-v16:16-v32:32-n16:32:64")
-                .unwrap()
-                .as_ptr(),
-        );
+        let data_layout = CString::new("e-i64:64-v16:16-v32:32-n16:32:64").unwrap();
+        LLVMSetDataLayout(module, data_layout.as_ptr());
 
         let module_contents_raw = LLVMPrintModuleToString(module);
         let module_contents = CStr::from_ptr(module_contents_raw);