Merge pull request #1423 from Xanewok/enforce-formatting

Enforce formatting

Author: Xanewok

.travis.yml

@@ -1,6 +1,5 @@
 language: rust
-dist: trusty
-sudo: false
+dist: xenial
 cache:
   cargo: false
 os:
@@ -10,21 +9,23 @@ os:
 rust:
   - nightly
 install:
+  - rustup component add rustfmt
   # Required for Racer autoconfiguration
   - rustup component add rust-src
   - rustup component add rust-analysis
 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)
+  - (cd rls-vfs && cargo test -v && cargo fmt -- --check)
+  - cargo fmt -- --check
   - 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:

rls/src/actions/requests.rs

@@ -17,12 +17,11 @@ use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use url::Url;
 
-use crate::actions::InitActionContext;
 use crate::actions::hover;
 use crate::actions::run::collect_run_actions;
+use crate::actions::InitActionContext;
 use crate::build::Edition;
 use crate::lsp_data;
-use crate::lsp_data::*;
 use crate::lsp_data::request::ApplyWorkspaceEdit;
 pub use crate::lsp_data::request::{
     CodeActionRequest as CodeAction, CodeLensRequest, Completion,
@@ -31,6 +30,7 @@ pub use crate::lsp_data::request::{
     HoverRequest as Hover, RangeFormatting, References, Rename,
     ResolveCompletionItem as ResolveCompletion, WorkspaceSymbol,
 };
+use crate::lsp_data::*;
 use crate::server;
 use crate::server::{Ack, Output, Request, RequestAction, ResponseError, ResponseWithMessage};
 

rls/src/build/cargo.rs

@@ -10,8 +10,8 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 
 use cargo::core::compiler::{BuildConfig, CompileMode, Context, Executor, Unit};
-use cargo::core::Package;
 use cargo::core::resolver::ResolveError;
+use cargo::core::Package;
 use cargo::core::{
     enable_nightly_features, PackageId, Shell, Target, TargetKind, Verbosity, Workspace,
 };
@@ -184,9 +184,11 @@ fn run_cargo_ws(
 
         for package in &packages {
             if ws.members().find(|x| *x.name() == *package).is_none() {
-                warn!("couldn't find member package `{}` specified in `analyze_package` \
-                       configuration",
-                      package);
+                warn!(
+                    "couldn't find member package `{}` specified in `analyze_package` \
+                     configuration",
+                    package
+                );
             }
         }
 

rls/src/build/mod.rs

@@ -15,13 +15,13 @@ use log::{debug, info, trace};
 use rls_data::Analysis;
 use rls_vfs::Vfs;
 
+use self::environment::EnvironmentLock;
+use self::plan::{BuildGraph, BuildPlan, WorkStatus};
+pub use self::plan::{Crate, Edition};
 use crate::actions::post_build::PostBuildHandler;
 use crate::actions::progress::{ProgressNotifier, ProgressUpdate};
 use crate::config::Config;
 use crate::lsp_data::Range;
-use self::environment::EnvironmentLock;
-use self::plan::{BuildGraph, BuildPlan, WorkStatus};
-pub use self::plan::{Crate, Edition};
 
 mod cargo;
 mod cargo_plan;

rls/src/build/rustc.rs

@@ -35,18 +35,18 @@ use log::trace;
 use rls_data::Analysis;
 use rls_vfs::Vfs;
 
-use crate::build::environment::{Environment, EnvironmentLockFacade};
-use crate::build::{BufWriter, BuildResult};
-use crate::build::plan::{Crate, Edition};
-use crate::config::{ClippyPreference, Config};
-use self::rustc_driver::{run_compiler};
+use self::rustc::session::config::Input;
+use self::rustc::session::Session;
+use self::rustc_driver::run_compiler;
+use self::rustc_interface::interface;
 use self::rustc_save_analysis as save;
 use self::rustc_save_analysis::CallbackHandler;
-use self::rustc_interface::interface;
-use self::rustc::session::Session;
-use self::rustc::session::config::Input;
-use self::syntax::source_map::{FileLoader, RealFileLoader};
 use self::syntax::edition::Edition as RustcEdition;
+use self::syntax::source_map::{FileLoader, RealFileLoader};
+use crate::build::environment::{Environment, EnvironmentLockFacade};
+use crate::build::plan::{Crate, Edition};
+use crate::build::{BufWriter, BuildResult};
+use crate::config::{ClippyPreference, Config};
 
 // Runs a single instance of Rustc (in-process).
 pub(crate) fn rustc(

tests/client.rs

@@ -1803,8 +1803,8 @@ fn client_reformat_with_range() {
     let formatted = r#"pub fn main() {
     let world1 = "world";
     println!("Hello, {}!", world1);"#
-    .replace("\r", "")
-    .replace("\n", newline);
+        .replace("\r", "")
+        .replace("\n", newline);
 
     let edits = result.unwrap();
     assert_eq!(edits.len(), 2);