Auto merge of #1299 - Xanewok:monorepo, r=Xanewok

Set up a monorepo by pulling the external rls-* packages

Set up a monorepo, pulling every `rls-*` package into the repository. This is done to facilitate and centralize development and also to improve the discoverability of those packages.

An important thing to note is that this isn't and can't be a Cargo workspace, because it's used as a submodule inside a Rust repository, which is a Cargo workspace itself (and we don't support nested configurations).

Because of that, I also didn't use the `[patch.crates-io]` to point to the local repositories, since it might be counter-intuitive, as the patches in a Cargo workspace member manifest is not taken into account and only patch sections from the root manifest are.

Also got rid of Cargo.locks for the dependencies, since these are meant to be used as a library and so the lockfile is only respected for the primarily compiled package anyway.

Didn't move build.rs inside `rls/` since it seems there is a Cargo bug where it expects the build script to be at the top level, rebuilding everything on subsequent runs (despite specifying the `build = "rls/build.rs` key in Cargo.toml)?

r? @nrc

I'll move related issues here, after this is merged.

Author: bors

.travis.yml

@@ -1,29 +1,33 @@
 language: rust
 dist: trusty
 sudo: false
-branches:
-  except:
-  - staging.tmp
-  - trying.tmp
 cache:
   cargo: false
 os:
-- linux
-- osx
-- windows
+  - linux
+  - osx
+  - windows
 rust:
-- nightly
-install: |
-    # Required for Racer autoconfiguration
-    rustup component add rust-src
-    rustup component add rust-analysis
+  - nightly
+install:
+  # Required for Racer autoconfiguration
+  - rustup component add rust-src
+  - rustup component add rust-analysis
 script:
-- cargo build -v
-- cargo test -v
-- cargo test test_tooltip_std -- --ignored
+  - cargo build -v
+  - cargo test -v
+  - cargo test test_tooltip_std -- --ignored
+  # Since the rls-* subcrates use crates.io-based dependencies of themselves it
+  # makes sense to test them in isolation rather than just RLS itself
+  - (cd rls-analysis && cargo test -v)
+  - (cd rls-blacklist && cargo test -v)
+  - (cd rls-data && cargo test -v)
+  - (cd rls-rustc && cargo test -v)
+  - (cd rls-span && cargo test -v)
+  - (cd rls-vfs && cargo test -v)
 
 env:
   global:
-  - RUST_BACKTRACE=1
-  - RLS_TEST_WAIT_FOR_AGES=1
-  - CARGO_INCREMENTAL=0
+    - RUST_BACKTRACE=1
+    - RLS_TEST_WAIT_FOR_AGES=1
+    - CARGO_INCREMENTAL=0

Cargo.toml

@@ -13,12 +13,21 @@ build = "build.rs"
 [lib]
 name = "rls"
 doctest = false
+path = "rls/src/lib.rs"
 
 [[bin]]
 name = "rls"
 test = false
+path = "rls/src/main.rs"
 
 [dependencies]
+rls-analysis = "0.16.12"
+rls-blacklist = "0.1.3"
+rls-data = { version = "0.18.2", features = ["serialize-serde", "serialize-rustc"] }
+rls-rustc = "0.5.0"
+rls-span = { version = "0.4", features = ["serialize-serde"] }
+rls-vfs = "0.7"
+
 cargo = { git = "https://github.com/rust-lang/cargo", rev = "4e74e2fc0908524d17735c768067117d3e84ee9c" }
 cargo_metadata = "0.7"
 clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "5725726345039830677a0aeb8389ae78ce01ff97", optional = true }
@@ -34,12 +43,6 @@ num_cpus = "1"
 racer = { version = "=2.1.18", default-features = false }
 rand = "0.6"
 rayon = "1"
-rls-analysis = "0.16.12"
-rls-blacklist = "0.1.3"
-rls-data = { version = "0.18.2", features = ["serialize-serde", "serialize-rustc"] }
-rls-rustc = "0.5.0"
-rls-span = { version = "0.4", features = ["serialize-serde"] }
-rls-vfs = "0.7"
 rustc_tools_util = "0.1.1"
 rustfmt-nightly = "1.0.2"
 rustc-serialize = "0.3"

rls-analysis/.gitignore

@@ -0,0 +1,3 @@
+target
+
+Cargo.lock

rls-analysis/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "rls-analysis"
+version = "0.16.12"
+authors = ["Nick Cameron <ncameron@mozilla.com>"]
+description = "Library for processing rustc's save-analysis data for the RLS"
+license = "Apache-2.0/MIT"
+repository = "https://github.com/rust-lang/rls"
+categories = ["development-tools"]
+exclude = [
+    "test_data/*",
+]
+
+[dependencies]
+rustc-serialize = "0.3"
+log = "0.4"
+rls-data = "= 0.18.2"
+rls-span = "0.4"
+derive-new = "0.5"
+fst = { version = "0.3", default-features = false }
+itertools = "0.7.3"
+json = "0.11.13"
+
+[dev-dependencies]
+lazy_static = "1"
+env_logger = "0.5"

rls-analysis/README.md

@@ -0,0 +1,7 @@
+[![Build Status](https://travis-ci.org/nrc/rls-analysis.svg?branch=master)](https://travis-ci.org/nrc/rls-analysis)
+
+# rls-analysis
+
+Library for processing rustc's save-analysis data for the RLS.
+
+[API Documentation](https://docs.rs/rls-analysis/)

rls-analysis/benches/std_api_crate.rs

@@ -0,0 +1,94 @@
+// Copyright 2017 The RLS Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(test)]
+
+extern crate rls_analysis;
+#[macro_use]
+extern crate derive_new;
+#[macro_use]
+extern crate lazy_static;
+extern crate test;
+use test::Bencher;
+
+use std::path::{Path, PathBuf};
+use std::sync::RwLock;
+
+use rls_analysis::{AnalysisHost, AnalysisLoader, SearchDirectory};
+
+#[derive(Clone, new)]
+struct TestAnalysisLoader {
+    path: PathBuf,
+}
+
+impl AnalysisLoader for TestAnalysisLoader {
+    fn needs_hard_reload(&self, _path_prefix: &Path) -> bool {
+        true
+    }
+
+    fn fresh_host(&self) -> AnalysisHost<Self> {
+        AnalysisHost::new_with_loader(self.clone())
+    }
+
+    fn set_path_prefix(&mut self, _path_prefix: &Path) {}
+
+    fn abs_path_prefix(&self) -> Option<PathBuf> {
+        panic!();
+    }
+
+    fn search_directories(&self) -> Vec<SearchDirectory> {
+        vec![SearchDirectory::new(self.path.clone(), None)]
+    }
+}
+
+lazy_static! {
+    static ref STDLIB_FILE_PATH: PathBuf = PathBuf::from("/checkout/src/libstd/lib.rs");
+    static ref STDLIB_DATA_PATH: PathBuf = PathBuf::from("test_data/rust-analysis");
+
+    static ref HOST: RwLock<AnalysisHost<TestAnalysisLoader>> = {
+        let host = AnalysisHost::new_with_loader(TestAnalysisLoader::new(
+            STDLIB_DATA_PATH.clone(),
+        ));
+        host.reload(&STDLIB_DATA_PATH, &STDLIB_DATA_PATH).unwrap();
+        RwLock::new(host)
+    };
+}
+
+#[bench]
+fn search_for_id(b: &mut Bencher) {
+    let host = HOST.read().unwrap();
+
+    b.iter(|| {
+        let _ = host.search_for_id("no_std");
+    });
+}
+
+#[bench]
+fn search(b: &mut Bencher) {
+    let host = HOST.read().unwrap();
+    b.iter(|| {
+        let _ = host.search("some_inexistent_symbol");
+        
+    })
+}
+
+#[bench]
+fn symbols(b: &mut Bencher) {
+    let host = HOST.read().unwrap();
+    b.iter(|| {
+        let _ = host.symbols(&STDLIB_FILE_PATH);
+    })
+}
+
+#[bench]
+fn reload(b: &mut Bencher) {
+    let host = HOST.write().unwrap();
+    b.iter(|| {
+        host.reload(&STDLIB_DATA_PATH, &STDLIB_DATA_PATH).unwrap();
+    })
+}

rls-analysis/examples/print-crate-id.rs

@@ -0,0 +1,53 @@
+extern crate rls_analysis;
+extern crate env_logger;
+
+use rls_analysis::{AnalysisHost, AnalysisLoader, SearchDirectory};
+use std::path::{Path, PathBuf};
+use std::env;
+
+#[derive(Clone)]
+pub struct Loader {
+    deps_dir: PathBuf,
+}
+
+impl Loader {
+    pub fn new(deps_dir: PathBuf) -> Self {
+        Self { deps_dir }
+    }
+}
+
+impl AnalysisLoader for Loader {
+    fn needs_hard_reload(&self, _: &Path) -> bool {
+        true
+    }
+
+    fn fresh_host(&self) -> AnalysisHost<Self> {
+        AnalysisHost::new_with_loader(self.clone())
+    }
+
+    fn set_path_prefix(&mut self, _: &Path) {}
+
+    fn abs_path_prefix(&self) -> Option<PathBuf> {
+        None
+    }
+    fn search_directories(&self) -> Vec<SearchDirectory> {
+        vec![SearchDirectory {
+            path: self.deps_dir.clone(),
+            prefix_rewrite: None,
+        }]
+    }
+}
+
+fn main() {
+    env_logger::init();
+    if env::args().len() < 2 {
+        println!("Usage: print-crate-id <save-analysis-dir>");
+        std::process::exit(1);
+    }
+    let loader = Loader::new(PathBuf::from(env::args().nth(1).unwrap()));
+    let crates = rls_analysis::read_analysis_from_files(&loader, Default::default(), &[]);
+
+    for krate in &crates {
+        println!("Crate {:?} data version {:?}", krate.id, krate.analysis.version);
+    }
+}