From 0ec5d4f55c6a5ac3fadcd48ae17b70379aba17fa Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 25 Jun 2020 09:13:46 +0200 Subject: [PATCH] Rename ra_flycheck -> flycheck --- Cargo.lock | 26 +++++++++---------- crates/{ra_flycheck => flycheck}/Cargo.toml | 2 +- crates/{ra_flycheck => flycheck}/src/lib.rs | 0 crates/rust-analyzer/Cargo.toml | 2 +- crates/rust-analyzer/src/config.rs | 2 +- .../rust-analyzer/src/diagnostics/to_proto.rs | 19 +++++++------- crates/rust-analyzer/src/global_state.rs | 2 +- crates/rust-analyzer/src/main_loop.rs | 8 +++--- 8 files changed, 31 insertions(+), 30 deletions(-) rename crates/{ra_flycheck => flycheck}/Cargo.toml (92%) rename crates/{ra_flycheck => flycheck}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index c2d00adebc5..b2b62421268 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -340,6 +340,18 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +[[package]] +name = "flycheck" +version = "0.1.0" +dependencies = [ + "cargo_metadata", + "crossbeam-channel", + "jod-thread", + "log", + "ra_toolchain", + "serde_json", +] + [[package]] name = "fnv" version = "1.0.7" @@ -959,18 +971,6 @@ dependencies = [ "vfs", ] -[[package]] -name = "ra_flycheck" -version = "0.1.0" -dependencies = [ - "cargo_metadata", - "crossbeam-channel", - "jod-thread", - "log", - "ra_toolchain", - "serde_json", -] - [[package]] name = "ra_fmt" version = "0.1.0" @@ -1373,6 +1373,7 @@ dependencies = [ "anyhow", "crossbeam-channel", "env_logger", + "flycheck", "globset", "insta", "itertools", @@ -1384,7 +1385,6 @@ dependencies = [ "pico-args", "ra_cfg", "ra_db", - "ra_flycheck", "ra_hir", "ra_hir_def", "ra_hir_ty", diff --git a/crates/ra_flycheck/Cargo.toml b/crates/flycheck/Cargo.toml similarity index 92% rename from crates/ra_flycheck/Cargo.toml rename to crates/flycheck/Cargo.toml index 1aa39badea9..dc26b8ce764 100644 --- a/crates/ra_flycheck/Cargo.toml +++ b/crates/flycheck/Cargo.toml @@ -1,6 +1,6 @@ [package] edition = "2018" -name = "ra_flycheck" +name = "flycheck" version = "0.1.0" authors = ["rust-analyzer developers"] diff --git a/crates/ra_flycheck/src/lib.rs b/crates/flycheck/src/lib.rs similarity index 100% rename from crates/ra_flycheck/src/lib.rs rename to crates/flycheck/src/lib.rs diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 68d04f3e32c..08c67ddd0aa 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -32,7 +32,7 @@ threadpool = "1.7.1" stdx = { path = "../stdx" } lsp-server = "0.3.3" -ra_flycheck = { path = "../ra_flycheck" } +flycheck = { path = "../flycheck" } ra_ide = { path = "../ra_ide" } ra_prof = { path = "../ra_prof" } ra_project_model = { path = "../ra_project_model" } diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index 8f69de968f0..435bbbb6bcc 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -10,9 +10,9 @@ use std::{ffi::OsString, path::PathBuf}; use crate::diagnostics::DiagnosticsConfig; +use flycheck::FlycheckConfig; use lsp_types::ClientCapabilities; use ra_db::AbsPathBuf; -use ra_flycheck::FlycheckConfig; use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig}; use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest}; use serde::Deserialize; diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs index ba74f15f3c0..f379f5ed0ad 100644 --- a/crates/rust-analyzer/src/diagnostics/to_proto.rs +++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs @@ -2,20 +2,21 @@ //! `cargo check` json format to the LSP diagnostic format. use std::{collections::HashMap, path::Path}; +use flycheck::{Applicability, DiagnosticLevel, DiagnosticSpan, DiagnosticSpanMacroExpansion}; use lsp_types::{ Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Location, NumberOrString, Position, Range, TextEdit, Url, }; -use ra_flycheck::{Applicability, DiagnosticLevel, DiagnosticSpan, DiagnosticSpanMacroExpansion}; use stdx::format_to; -use super::DiagnosticsConfig; use crate::{lsp_ext, to_proto::url_from_abs_path}; +use super::DiagnosticsConfig; + /// Determines the LSP severity from a diagnostic fn map_diagnostic_to_severity( config: &DiagnosticsConfig, - val: &ra_flycheck::Diagnostic, + val: &flycheck::Diagnostic, ) -> Option { let res = match val.level { DiagnosticLevel::Ice => DiagnosticSeverity::Error, @@ -95,7 +96,7 @@ fn map_secondary_span_to_related( } /// Determines if diagnostic is related to unused code -fn is_unused_or_unnecessary(rd: &ra_flycheck::Diagnostic) -> bool { +fn is_unused_or_unnecessary(rd: &flycheck::Diagnostic) -> bool { match &rd.code { Some(code) => match code.code.as_str() { "dead_code" | "unknown_lints" | "unreachable_code" | "unused_attributes" @@ -107,7 +108,7 @@ fn is_unused_or_unnecessary(rd: &ra_flycheck::Diagnostic) -> bool { } /// Determines if diagnostic is related to deprecated code -fn is_deprecated(rd: &ra_flycheck::Diagnostic) -> bool { +fn is_deprecated(rd: &flycheck::Diagnostic) -> bool { match &rd.code { Some(code) => code.code.as_str() == "deprecated", None => false, @@ -121,7 +122,7 @@ enum MappedRustChildDiagnostic { } fn map_rust_child_diagnostic( - rd: &ra_flycheck::Diagnostic, + rd: &flycheck::Diagnostic, workspace_root: &Path, ) -> MappedRustChildDiagnostic { let spans: Vec<&DiagnosticSpan> = rd.spans.iter().filter(|s| s.is_primary).collect(); @@ -183,7 +184,7 @@ pub(crate) struct MappedRustDiagnostic { /// If the diagnostic has no primary span this will return `None` pub(crate) fn map_rust_diagnostic_to_lsp( config: &DiagnosticsConfig, - rd: &ra_flycheck::Diagnostic, + rd: &flycheck::Diagnostic, workspace_root: &Path, ) -> Vec { let primary_spans: Vec<&DiagnosticSpan> = rd.spans.iter().filter(|s| s.is_primary).collect(); @@ -286,8 +287,8 @@ pub(crate) fn map_rust_diagnostic_to_lsp( mod tests { use super::*; - fn parse_diagnostic(val: &str) -> ra_flycheck::Diagnostic { - serde_json::from_str::(val).unwrap() + fn parse_diagnostic(val: &str) -> flycheck::Diagnostic { + serde_json::from_str::(val).unwrap() } #[test] diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs index c022ff705a5..6038bf664f0 100644 --- a/crates/rust-analyzer/src/global_state.rs +++ b/crates/rust-analyzer/src/global_state.rs @@ -6,10 +6,10 @@ use std::{convert::TryFrom, sync::Arc}; use crossbeam_channel::{unbounded, Receiver}; +use flycheck::{CheckTask, FlycheckConfig, FlycheckHandle}; use lsp_types::Url; use parking_lot::RwLock; use ra_db::{CrateId, SourceRoot, VfsPath}; -use ra_flycheck::{CheckTask, FlycheckConfig, FlycheckHandle}; use ra_ide::{Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId}; use ra_project_model::{CargoWorkspace, ProcMacroClient, ProjectWorkspace, Target}; use stdx::format_to; diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index e5f82de5ed7..0664e4a5a40 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs @@ -9,10 +9,10 @@ use std::{ }; use crossbeam_channel::{never, select, unbounded, RecvError, Sender}; +use flycheck::CheckTask; use lsp_server::{Connection, ErrorCode, Message, Notification, Request, RequestId, Response}; use lsp_types::{request::Request as _, NumberOrString, TextDocumentContentChangeEvent}; use ra_db::VfsPath; -use ra_flycheck::CheckTask; use ra_ide::{Canceled, FileId, LineIndex}; use ra_prof::profile; use ra_project_model::{PackageRoot, ProjectWorkspace}; @@ -629,9 +629,9 @@ fn on_check_task( CheckTask::Status(status) => { let (state, message) = match status { - ra_flycheck::Status::Being => (ProgressState::Start, None), - ra_flycheck::Status::Progress(target) => (ProgressState::Report, Some(target)), - ra_flycheck::Status::End => (ProgressState::End, None), + flycheck::Status::Being => (ProgressState::Start, None), + flycheck::Status::Progress(target) => (ProgressState::Report, Some(target)), + flycheck::Status::End => (ProgressState::End, None), }; report_progress(global_state, msg_sender, "cargo check", state, message, None);