Merge pull request #1498 from rust-lang/azure-pipelines

Set up Azure Pipelines CI

Author: Xanewok

.travis.yml

@@ -26,7 +26,6 @@ script:
       # 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 && cargo fmt -- --check)
-      (cd rls-blacklist && cargo test -v && cargo fmt -- --check)
       (cd rls-data && cargo test -v && cargo fmt -- --check)
       (cd rls-rustc && cargo test -v && cargo fmt -- --check)
       (cd rls-span && cargo test -v && cargo fmt -- --check)

azure-pipelines.yml

@@ -0,0 +1,36 @@
+trigger: ["master"]
+pr: ["master"]
+
+variables:
+  CARGO_INCREMENTAL: 0
+  RUST_BACKTRACE: 1
+  RLS_TEST_WAIT_FOR_AGES: 1
+
+jobs:
+# Check formatting
+- template: ci/azure-rustfmt.yml
+  parameters:
+    rust: nightly-2019-08-01 # Use last well-known available nightly
+    name: rustfmt
+    crates:
+      rls-analysis: []
+      rls-data: []
+      rls-rustc: []
+      rls-span: []
+      rls-vfs: []
+      ".": []
+
+# Run unit and integration tests
+- template: ci/azure-test.yml
+  parameters:
+    rust: nightly
+    name: tests
+    crates:
+      rls-analysis: []
+      rls-data: []
+      rls-rustc: []
+      rls-span: []
+      rls-vfs: []
+      ".":
+        - test_name: test_tooltip_std
+          args: --ignored

build.rs

@@ -15,6 +15,9 @@ fn main() {
     );
     println!(
         "cargo:rustc-env=FIXTURES_DIR={}",
-        Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap()).join("tests/fixtures").display()
+        Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
+            .join("tests")
+            .join("fixtures")
+            .display()
     );
 }

ci/azure-install-rust.yml

@@ -0,0 +1,33 @@
+steps:
+  # Linux and macOS.
+  - script: |
+      set -e
+      curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+      export PATH=$PATH:$HOME/.cargo/bin
+      rustup toolchain install $RUSTUP_TOOLCHAIN
+      rustup default $RUSTUP_TOOLCHAIN
+      echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
+    env:
+      RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
+    displayName: "Install rust (*nix)"
+    condition: not(eq(variables['Agent.OS'], 'Windows_NT'))
+
+  # Windows.
+  - script: |
+      curl -sSf -o rustup-init.exe https://win.rustup.rs
+      rustup-init.exe -y --default-toolchain none
+      set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+      rustup toolchain install %RUSTUP_TOOLCHAIN%
+      rustup default %RUSTUP_TOOLCHAIN%
+      echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
+    env:
+      RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
+    displayName: "Install rust (windows)"
+    condition: eq(variables['Agent.OS'], 'Windows_NT')
+
+  # All platforms.
+  - script: |
+        rustup toolchain list
+        rustc -Vv
+        cargo -V
+    displayName: Query rust and cargo versions

ci/azure-rustfmt.yml

@@ -0,0 +1,18 @@
+jobs:
+# Check formatting
+- job: ${{ parameters.name }}
+  displayName: Check formatting
+  pool:
+    vmImage: ubuntu-16.04
+  steps:
+    - template: azure-install-rust.yml
+      parameters:
+        rust_version: ${{ parameters.rust }}
+    - script: |
+        rustup component add rustfmt
+        cargo fmt --version
+      displayName: Install rustfmt
+    - ${{ each crate in parameters.crates }}:
+      - script: cargo fmt --all -- --check
+        displayName: Check formatting - ${{ crate.key }}
+        workingDirectory: $(Build.SourcesDirectory)/${{ crate.key }}

ci/azure-test.yml

@@ -0,0 +1,29 @@
+jobs:
+# Check formatting
+- job: ${{ parameters.name }}
+  displayName: Run tests on
+  strategy:
+    matrix:
+      linux:
+        imageName: 'ubuntu-16.04'
+      mac:
+        imageName: 'macos-10.14'
+      windows:
+        imageName: 'vs2017-win2016'
+  pool:
+    vmImage: $(imageName)
+  steps:
+    - template: azure-install-rust.yml
+      parameters:
+        rust_version: ${{ parameters.rust }}
+    - script: |
+        rustup component add rust-src rust-analysis
+      displayName: Install distributed Rust source code for Racer autocompletion
+    - ${{ each crate in parameters.crates }}:
+      - script: cargo test -v
+        displayName: Run tests - ${{ crate.key }}
+        workingDirectory: $(Build.SourcesDirectory)/${{ crate.key }}
+      - ${{ each extra in crate.value }}:
+        - script: cargo test -v ${{ extra.test_name }} -- ${{ extra.args }}
+          displayName: Run tests - ${{ crate.key }} - ${{ extra.test_name }}
+          workingDirectory: $(Build.SourcesDirectory)/${{ crate.key }}

rls-vfs/src/lib.rs

@@ -921,8 +921,7 @@ mod tests {
 
         assert_eq!(
             '😢'.len_utf8(),
-            byte_in_str_utf16("😢a", Column::new_zero_indexed('😢'.len_utf16() as u32))
-                .unwrap()
+            byte_in_str_utf16("😢a", Column::new_zero_indexed('😢'.len_utf16() as u32)).unwrap()
         );
 
         // 😢 is represented by 2 u16s - we can't index in the middle of a character

rls/src/actions/hover.rs

@@ -504,43 +504,6 @@ fn create_tooltip(
     tooltip
 }
 
-/// Skips `skip_components` from the `path` if the path starts with `prefix`.
-/// Returns the original path if there is no match.
-///
-/// # Examples
-///
-/// ```ignore
-/// # use std::path::Path;
-///
-/// let base_path = Path::new(".rustup/toolchains/nightly-x86_64-pc-windows-msvc/lib/rustlib/src/rust/src/liballoc/string.rs");
-/// let tidy_path = skip_path_components(base_path, ".rustup", 7);
-/// assert_eq!(tidy_path, Some(PathBuf::from("liballoc/string.rs")));
-///
-/// let base_path = Path::new("/home/user/.cargo/registry/src/github.com-1ecc6299db9ec823/smallvec-0.6.2/lib.rs");
-/// let tidy_path = skip_path_components(base_path, "/home/user/.cargo", 3);
-/// assert_eq!(tidy_path, Some(PathBuf::from("smallvec-0.6.2/lib.rs")));
-///
-/// let base_path = Path::new("/home/user/.cargo/registry/src/github.com-1ecc6299db9ec823/smallvec-0.6.2/lib.rs");
-/// let tidy_path = skip_path_components(base_path, ".cargo", 3);
-/// assert_eq!(tidy_path, None);
-///
-/// let base_path = Path::new("some/unknown/path/lib.rs");
-/// let tidy_path = skip_path_components(base_path, ".rustup", 4);
-/// assert_eq!(tidy_path, None);
-/// ```
-fn skip_path_components<P: AsRef<Path>>(
-    path: &Path,
-    prefix: P,
-    skip_components: usize,
-) -> Option<PathBuf> {
-    path.strip_prefix(prefix).ok().map(|stripped| {
-        stripped.components().skip(skip_components).fold(PathBuf::new(), |mut comps, comp| {
-            comps.push(comp);
-            comps
-        })
-    })
-}
-
 /// Collapses parent directory references inside of paths.
 ///
 /// # Example
@@ -613,22 +576,28 @@ fn racer_match_to_def(ctx: &InitActionContext, m: &racer::Match) -> Option<Def>
         use std::env;
 
         let home = home::home_dir().unwrap_or_default();
-        let rustup_home =
-            env::var("RUSTUP_HOME").map(PathBuf::from).unwrap_or_else(|_| home.join(".rustup"));
         let cargo_home =
             env::var("CARGO_HOME").map(PathBuf::from).unwrap_or_else(|_| home.join(".cargo"));
+        let cargo_registry_src =
+            cargo_home.join("registry").join("src").join("github.com-1ecc6299db9ec823");
+        let rust_src_path = racer::get_rust_src_path().ok();
 
         let contextstr = m.contextstr.replacen("\\\\?\\", "", 1);
         let contextstr_path = PathBuf::from(&contextstr);
         let contextstr_path = collapse_parents(contextstr_path);
 
-        // Tidy up the module path.
-        // Skips `toolchains/$TOOLCHAIN/lib/rustlib/src/rust/src`.
-        skip_path_components(&contextstr_path, rustup_home, 7)
-            // Skips `/registry/src/github.com-1ecc6299db9ec823/`.
-            .or_else(|| skip_path_components(&contextstr_path, cargo_home, 3))
-            // Make the path relative to the root of the project, if possible.
+        // Attempt to tidy up the module path
+        rust_src_path
+            .and_then(|rust_src_path| {
+                // Make the path relative to Rust src root
+                contextstr_path.strip_prefix(rust_src_path).ok().map(ToOwned::to_owned)
+            })
+            .or_else(|| {
+                // Make the path relative to the package root cached in Cargo registry
+                contextstr_path.strip_prefix(cargo_registry_src).ok().map(ToOwned::to_owned)
+            })
             .or_else(|| {
+                // Make the path relative to the root of the project
                 contextstr_path.strip_prefix(&ctx.current_project).ok().map(ToOwned::to_owned)
             })
             .and_then(|path| path.to_str().map(ToOwned::to_owned))