From b89991daed7e4863834b91976cda48f4395482c4 Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Sun, 26 Jan 2020 10:46:45 -0500
Subject: Update crates
---
Cargo.lock | 44 ++++++++++++++++++++--------------------
crates/ra_cargo_watch/Cargo.toml | 2 +-
crates/ra_hir_def/Cargo.toml | 2 +-
crates/ra_hir_ty/Cargo.toml | 2 +-
crates/ra_ide/Cargo.toml | 2 +-
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 8e320458b..c51bc26a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,7 +115,7 @@ dependencies = [
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -214,7 +214,7 @@ dependencies = [
[[package]]
name = "console"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -480,14 +480,14 @@ dependencies = [
[[package]]
name = "insta"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
"uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -510,7 +510,7 @@ dependencies = [
[[package]]
name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -610,7 +610,7 @@ dependencies = [
"crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -621,7 +621,7 @@ dependencies = [
"base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -893,12 +893,12 @@ version = "0.1.0"
dependencies = [
"cargo_metadata 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lsp-types 0.70.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -970,7 +970,7 @@ dependencies = [
"anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
"drop_bomb 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ra_arena 0.1.0",
@@ -1009,7 +1009,7 @@ dependencies = [
"chalk-rust-ir 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)",
"chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)",
"ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"ra_arena 0.1.0",
@@ -1030,7 +1030,7 @@ dependencies = [
"format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fst 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1075,7 +1075,7 @@ dependencies = [
"relative-path 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"test_utils 0.1.0",
"threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1124,7 +1124,7 @@ dependencies = [
"ra_db 0.1.0",
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1508,10 +1508,10 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.44"
+version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1596,7 +1596,7 @@ name = "test_utils"
version = "0.1.0"
dependencies = [
"difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
"text_unit 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -1793,7 +1793,7 @@ dependencies = [
"checksum chalk-solve 0.1.0 (git+https://github.com/rust-lang/chalk.git?rev=ff65b5ac9860f3c36bd892c865ab23d5ff0bbae5)" = "<none>"
"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f"
+"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0"
"checksum crossbeam 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
@@ -1826,10 +1826,10 @@ dependencies = [
"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc"
"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8"
"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
-"checksum insta 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d499dc062e841590a67230d853bce62d0abeb91304927871670b7c55c461349"
+"checksum insta 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d07d2003a61f1eae49feeb2aea003d0da6c80587c20ac505d695805c744d4847"
"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
"checksum jemalloc-ctl 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7"
"checksum jemalloc-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45"
"checksum jemallocator 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69"
@@ -1908,7 +1908,7 @@ dependencies = [
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
+"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b"
"checksum serde_repr 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cd02c7587ec314570041b2754829f84d873ced14a96d1fd1823531e11db40573"
"checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35"
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
diff --git a/crates/ra_cargo_watch/Cargo.toml b/crates/ra_cargo_watch/Cargo.toml
index e88295539..49e06e0d3 100644
--- a/crates/ra_cargo_watch/Cargo.toml
+++ b/crates/ra_cargo_watch/Cargo.toml
@@ -13,5 +13,5 @@ jod-thread = "0.1.0"
parking_lot = "0.10.0"
[dev-dependencies]
-insta = "0.12.0"
+insta = "0.13.0"
serde_json = "1.0"
\ No newline at end of file
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 2c368f690..1efa00fe0 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -26,4 +26,4 @@ ra_cfg = { path = "../ra_cfg" }
tt = { path = "../ra_tt", package = "ra_tt" }
[dev-dependencies]
-insta = "0.12.0"
+insta = "0.13.0"
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 60793db44..d229639d9 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -28,4 +28,4 @@ chalk-ir = { git = "https://github.com/rust-lang/chalk.git", rev = "ff65b5a
lalrpop-intern = "0.15.1"
[dev-dependencies]
-insta = "0.12.0"
+insta = "0.13.0"
diff --git a/crates/ra_ide/Cargo.toml b/crates/ra_ide/Cargo.toml
index 2c9f9dce0..53817d1f7 100644
--- a/crates/ra_ide/Cargo.toml
+++ b/crates/ra_ide/Cargo.toml
@@ -39,7 +39,7 @@ ra_assists = { path = "../ra_assists" }
hir = { path = "../ra_hir", package = "ra_hir" }
[dev-dependencies]
-insta = "0.12.0"
+insta = "0.13.0"
[dev-dependencies.proptest]
version = "0.9.0"
--
cgit v1.2.3
From 6967472703ced1bda88179703874365736def5fc Mon Sep 17 00:00:00 2001
From: Jeremy Kolb <kjeremy@gmail.com>
Date: Sun, 26 Jan 2020 13:29:01 -0500
Subject: Move snaps to new naming scheme
---
...watch__conv__test__snap_clippy_pass_by_ref.snap | 85 ++++++++++++++++++++++
...h__conv__test__snap_handles_macro_location.snap | 46 ++++++++++++
...tch__conv__test__snap_macro_compiler_error.snap | 61 ++++++++++++++++
...st__snap_rustc_incompatible_type_for_trait.snap | 46 ++++++++++++
...ch__conv__test__snap_rustc_mismatched_type.snap | 46 ++++++++++++
...ch__conv__test__snap_rustc_unused_variable.snap | 70 ++++++++++++++++++
...est__snap_rustc_wrong_number_of_parameters.snap | 65 +++++++++++++++++
.../snapshots/test__snap_clippy_pass_by_ref.snap | 85 ----------------------
.../test__snap_handles_macro_location.snap | 46 ------------
.../snapshots/test__snap_macro_compiler_error.snap | 61 ----------------
...st__snap_rustc_incompatible_type_for_trait.snap | 46 ------------
.../test__snap_rustc_mismatched_type.snap | 46 ------------
.../test__snap_rustc_unused_variable.snap | 70 ------------------
...est__snap_rustc_wrong_number_of_parameters.snap | 65 -----------------
14 files changed, 419 insertions(+), 419 deletions(-)
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_handles_macro_location.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_macro_compiler_error.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_incompatible_type_for_trait.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_mismatched_type.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
create mode 100644 crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_wrong_number_of_parameters.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_clippy_pass_by_ref.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_handles_macro_location.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_macro_compiler_error.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_incompatible_type_for_trait.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_mismatched_type.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_unused_variable.snap
delete mode 100644 crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_wrong_number_of_parameters.snap
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
new file mode 100644
index 000000000..cb0920914
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_clippy_pass_by_ref.snap
@@ -0,0 +1,85 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/compiler/mir/tagset.rs",
+ range: Range {
+ start: Position {
+ line: 41,
+ character: 23,
+ },
+ end: Position {
+ line: 41,
+ character: 28,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 41,
+ character: 23,
+ },
+ end: Position {
+ line: 41,
+ character: 28,
+ },
+ },
+ severity: Some(
+ Warning,
+ ),
+ code: Some(
+ String(
+ "trivially_copy_pass_by_ref",
+ ),
+ ),
+ source: Some(
+ "clippy",
+ ),
+ message: "this argument is passed by reference, but would be more efficient if passed by value\n#[warn(clippy::trivially_copy_pass_by_ref)] implied by #[warn(clippy::all)]\nfor further information visit https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref",
+ related_information: Some(
+ [
+ DiagnosticRelatedInformation {
+ location: Location {
+ uri: "file:///test/compiler/lib.rs",
+ range: Range {
+ start: Position {
+ line: 0,
+ character: 8,
+ },
+ end: Position {
+ line: 0,
+ character: 19,
+ },
+ },
+ },
+ message: "lint level defined here",
+ },
+ ],
+ ),
+ tags: None,
+ },
+ suggested_fixes: [
+ SuggestedFix {
+ title: "consider passing by value instead: \'self\'",
+ location: Location {
+ uri: "file:///test/compiler/mir/tagset.rs",
+ range: Range {
+ start: Position {
+ line: 41,
+ character: 23,
+ },
+ end: Position {
+ line: 41,
+ character: 28,
+ },
+ },
+ },
+ replacement: "self",
+ applicability: Unspecified,
+ diagnostics: [],
+ },
+ ],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_handles_macro_location.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_handles_macro_location.snap
new file mode 100644
index 000000000..19510ecc1
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_handles_macro_location.snap
@@ -0,0 +1,46 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/src/main.rs",
+ range: Range {
+ start: Position {
+ line: 1,
+ character: 4,
+ },
+ end: Position {
+ line: 1,
+ character: 26,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 1,
+ character: 4,
+ },
+ end: Position {
+ line: 1,
+ character: 26,
+ },
+ },
+ severity: Some(
+ Error,
+ ),
+ code: Some(
+ String(
+ "E0277",
+ ),
+ ),
+ source: Some(
+ "rustc",
+ ),
+ message: "can\'t compare `{integer}` with `&str`\nthe trait `std::cmp::PartialEq<&str>` is not implemented for `{integer}`",
+ related_information: None,
+ tags: None,
+ },
+ suggested_fixes: [],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_macro_compiler_error.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_macro_compiler_error.snap
new file mode 100644
index 000000000..92f7eec05
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_macro_compiler_error.snap
@@ -0,0 +1,61 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/crates/ra_hir_def/src/data.rs",
+ range: Range {
+ start: Position {
+ line: 79,
+ character: 15,
+ },
+ end: Position {
+ line: 79,
+ character: 41,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 79,
+ character: 15,
+ },
+ end: Position {
+ line: 79,
+ character: 41,
+ },
+ },
+ severity: Some(
+ Error,
+ ),
+ code: None,
+ source: Some(
+ "rustc",
+ ),
+ message: "Please register your known path in the path module",
+ related_information: Some(
+ [
+ DiagnosticRelatedInformation {
+ location: Location {
+ uri: "file:///test/crates/ra_hir_def/src/path.rs",
+ range: Range {
+ start: Position {
+ line: 264,
+ character: 8,
+ },
+ end: Position {
+ line: 264,
+ character: 76,
+ },
+ },
+ },
+ message: "Error originated from macro here",
+ },
+ ],
+ ),
+ tags: None,
+ },
+ suggested_fixes: [],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_incompatible_type_for_trait.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_incompatible_type_for_trait.snap
new file mode 100644
index 000000000..cf683e4b6
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_incompatible_type_for_trait.snap
@@ -0,0 +1,46 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/compiler/ty/list_iter.rs",
+ range: Range {
+ start: Position {
+ line: 51,
+ character: 4,
+ },
+ end: Position {
+ line: 51,
+ character: 47,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 51,
+ character: 4,
+ },
+ end: Position {
+ line: 51,
+ character: 47,
+ },
+ },
+ severity: Some(
+ Error,
+ ),
+ code: Some(
+ String(
+ "E0053",
+ ),
+ ),
+ source: Some(
+ "rustc",
+ ),
+ message: "method `next` has an incompatible type for trait\nexpected type `fn(&mut ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&ty::Ref<M>>`\n found type `fn(&ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&\'list ty::Ref<M>>`",
+ related_information: None,
+ tags: None,
+ },
+ suggested_fixes: [],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_mismatched_type.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_mismatched_type.snap
new file mode 100644
index 000000000..8c1483c74
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_mismatched_type.snap
@@ -0,0 +1,46 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/runtime/compiler_support.rs",
+ range: Range {
+ start: Position {
+ line: 47,
+ character: 64,
+ },
+ end: Position {
+ line: 47,
+ character: 69,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 47,
+ character: 64,
+ },
+ end: Position {
+ line: 47,
+ character: 69,
+ },
+ },
+ severity: Some(
+ Error,
+ ),
+ code: Some(
+ String(
+ "E0308",
+ ),
+ ),
+ source: Some(
+ "rustc",
+ ),
+ message: "mismatched types\nexpected usize, found u32",
+ related_information: None,
+ tags: None,
+ },
+ suggested_fixes: [],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
new file mode 100644
index 000000000..eb5a2247b
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_unused_variable.snap
@@ -0,0 +1,70 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/driver/subcommand/repl.rs",
+ range: Range {
+ start: Position {
+ line: 290,
+ character: 8,
+ },
+ end: Position {
+ line: 290,
+ character: 11,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 290,
+ character: 8,
+ },
+ end: Position {
+ line: 290,
+ character: 11,
+ },
+ },
+ severity: Some(
+ Warning,
+ ),
+ code: Some(
+ String(
+ "unused_variables",
+ ),
+ ),
+ source: Some(
+ "rustc",
+ ),
+ message: "unused variable: `foo`\n#[warn(unused_variables)] on by default",
+ related_information: None,
+ tags: Some(
+ [
+ Unnecessary,
+ ],
+ ),
+ },
+ suggested_fixes: [
+ SuggestedFix {
+ title: "consider prefixing with an underscore: \'_foo\'",
+ location: Location {
+ uri: "file:///test/driver/subcommand/repl.rs",
+ range: Range {
+ start: Position {
+ line: 290,
+ character: 8,
+ },
+ end: Position {
+ line: 290,
+ character: 11,
+ },
+ },
+ },
+ replacement: "_foo",
+ applicability: MachineApplicable,
+ diagnostics: [],
+ },
+ ],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_wrong_number_of_parameters.snap b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_wrong_number_of_parameters.snap
new file mode 100644
index 000000000..2f4518931
--- /dev/null
+++ b/crates/ra_cargo_watch/src/conv/snapshots/ra_cargo_watch__conv__test__snap_rustc_wrong_number_of_parameters.snap
@@ -0,0 +1,65 @@
+---
+source: crates/ra_cargo_watch/src/conv/test.rs
+expression: diag
+---
+MappedRustDiagnostic {
+ location: Location {
+ uri: "file:///test/compiler/ty/select.rs",
+ range: Range {
+ start: Position {
+ line: 103,
+ character: 17,
+ },
+ end: Position {
+ line: 103,
+ character: 29,
+ },
+ },
+ },
+ diagnostic: Diagnostic {
+ range: Range {
+ start: Position {
+ line: 103,
+ character: 17,
+ },
+ end: Position {
+ line: 103,
+ character: 29,
+ },
+ },
+ severity: Some(
+ Error,
+ ),
+ code: Some(
+ String(
+ "E0061",
+ ),
+ ),
+ source: Some(
+ "rustc",
+ ),
+ message: "this function takes 2 parameters but 3 parameters were supplied\nexpected 2 parameters",
+ related_information: Some(
+ [
+ DiagnosticRelatedInformation {
+ location: Location {
+ uri: "file:///test/compiler/ty/select.rs",
+ range: Range {
+ start: Position {
+ line: 218,
+ character: 4,
+ },
+ end: Position {
+ line: 230,
+ character: 5,
+ },
+ },
+ },
+ message: "defined here",
+ },
+ ],
+ ),
+ tags: None,
+ },
+ suggested_fixes: [],
+}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_clippy_pass_by_ref.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_clippy_pass_by_ref.snap
deleted file mode 100644
index cb0920914..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_clippy_pass_by_ref.snap
+++ /dev/null
@@ -1,85 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/compiler/mir/tagset.rs",
- range: Range {
- start: Position {
- line: 41,
- character: 23,
- },
- end: Position {
- line: 41,
- character: 28,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 41,
- character: 23,
- },
- end: Position {
- line: 41,
- character: 28,
- },
- },
- severity: Some(
- Warning,
- ),
- code: Some(
- String(
- "trivially_copy_pass_by_ref",
- ),
- ),
- source: Some(
- "clippy",
- ),
- message: "this argument is passed by reference, but would be more efficient if passed by value\n#[warn(clippy::trivially_copy_pass_by_ref)] implied by #[warn(clippy::all)]\nfor further information visit https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref",
- related_information: Some(
- [
- DiagnosticRelatedInformation {
- location: Location {
- uri: "file:///test/compiler/lib.rs",
- range: Range {
- start: Position {
- line: 0,
- character: 8,
- },
- end: Position {
- line: 0,
- character: 19,
- },
- },
- },
- message: "lint level defined here",
- },
- ],
- ),
- tags: None,
- },
- suggested_fixes: [
- SuggestedFix {
- title: "consider passing by value instead: \'self\'",
- location: Location {
- uri: "file:///test/compiler/mir/tagset.rs",
- range: Range {
- start: Position {
- line: 41,
- character: 23,
- },
- end: Position {
- line: 41,
- character: 28,
- },
- },
- },
- replacement: "self",
- applicability: Unspecified,
- diagnostics: [],
- },
- ],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_handles_macro_location.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_handles_macro_location.snap
deleted file mode 100644
index 19510ecc1..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_handles_macro_location.snap
+++ /dev/null
@@ -1,46 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/src/main.rs",
- range: Range {
- start: Position {
- line: 1,
- character: 4,
- },
- end: Position {
- line: 1,
- character: 26,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 1,
- character: 4,
- },
- end: Position {
- line: 1,
- character: 26,
- },
- },
- severity: Some(
- Error,
- ),
- code: Some(
- String(
- "E0277",
- ),
- ),
- source: Some(
- "rustc",
- ),
- message: "can\'t compare `{integer}` with `&str`\nthe trait `std::cmp::PartialEq<&str>` is not implemented for `{integer}`",
- related_information: None,
- tags: None,
- },
- suggested_fixes: [],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_macro_compiler_error.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_macro_compiler_error.snap
deleted file mode 100644
index 92f7eec05..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_macro_compiler_error.snap
+++ /dev/null
@@ -1,61 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/crates/ra_hir_def/src/data.rs",
- range: Range {
- start: Position {
- line: 79,
- character: 15,
- },
- end: Position {
- line: 79,
- character: 41,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 79,
- character: 15,
- },
- end: Position {
- line: 79,
- character: 41,
- },
- },
- severity: Some(
- Error,
- ),
- code: None,
- source: Some(
- "rustc",
- ),
- message: "Please register your known path in the path module",
- related_information: Some(
- [
- DiagnosticRelatedInformation {
- location: Location {
- uri: "file:///test/crates/ra_hir_def/src/path.rs",
- range: Range {
- start: Position {
- line: 264,
- character: 8,
- },
- end: Position {
- line: 264,
- character: 76,
- },
- },
- },
- message: "Error originated from macro here",
- },
- ],
- ),
- tags: None,
- },
- suggested_fixes: [],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_incompatible_type_for_trait.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_incompatible_type_for_trait.snap
deleted file mode 100644
index cf683e4b6..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_incompatible_type_for_trait.snap
+++ /dev/null
@@ -1,46 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/compiler/ty/list_iter.rs",
- range: Range {
- start: Position {
- line: 51,
- character: 4,
- },
- end: Position {
- line: 51,
- character: 47,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 51,
- character: 4,
- },
- end: Position {
- line: 51,
- character: 47,
- },
- },
- severity: Some(
- Error,
- ),
- code: Some(
- String(
- "E0053",
- ),
- ),
- source: Some(
- "rustc",
- ),
- message: "method `next` has an incompatible type for trait\nexpected type `fn(&mut ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&ty::Ref<M>>`\n found type `fn(&ty::list_iter::ListIterator<\'list, M>) -> std::option::Option<&\'list ty::Ref<M>>`",
- related_information: None,
- tags: None,
- },
- suggested_fixes: [],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_mismatched_type.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_mismatched_type.snap
deleted file mode 100644
index 8c1483c74..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_mismatched_type.snap
+++ /dev/null
@@ -1,46 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/runtime/compiler_support.rs",
- range: Range {
- start: Position {
- line: 47,
- character: 64,
- },
- end: Position {
- line: 47,
- character: 69,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 47,
- character: 64,
- },
- end: Position {
- line: 47,
- character: 69,
- },
- },
- severity: Some(
- Error,
- ),
- code: Some(
- String(
- "E0308",
- ),
- ),
- source: Some(
- "rustc",
- ),
- message: "mismatched types\nexpected usize, found u32",
- related_information: None,
- tags: None,
- },
- suggested_fixes: [],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_unused_variable.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_unused_variable.snap
deleted file mode 100644
index eb5a2247b..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_unused_variable.snap
+++ /dev/null
@@ -1,70 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/driver/subcommand/repl.rs",
- range: Range {
- start: Position {
- line: 290,
- character: 8,
- },
- end: Position {
- line: 290,
- character: 11,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 290,
- character: 8,
- },
- end: Position {
- line: 290,
- character: 11,
- },
- },
- severity: Some(
- Warning,
- ),
- code: Some(
- String(
- "unused_variables",
- ),
- ),
- source: Some(
- "rustc",
- ),
- message: "unused variable: `foo`\n#[warn(unused_variables)] on by default",
- related_information: None,
- tags: Some(
- [
- Unnecessary,
- ],
- ),
- },
- suggested_fixes: [
- SuggestedFix {
- title: "consider prefixing with an underscore: \'_foo\'",
- location: Location {
- uri: "file:///test/driver/subcommand/repl.rs",
- range: Range {
- start: Position {
- line: 290,
- character: 8,
- },
- end: Position {
- line: 290,
- character: 11,
- },
- },
- },
- replacement: "_foo",
- applicability: MachineApplicable,
- diagnostics: [],
- },
- ],
-}
diff --git a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_wrong_number_of_parameters.snap b/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_wrong_number_of_parameters.snap
deleted file mode 100644
index 2f4518931..000000000
--- a/crates/ra_cargo_watch/src/conv/snapshots/test__snap_rustc_wrong_number_of_parameters.snap
+++ /dev/null
@@ -1,65 +0,0 @@
----
-source: crates/ra_cargo_watch/src/conv/test.rs
-expression: diag
----
-MappedRustDiagnostic {
- location: Location {
- uri: "file:///test/compiler/ty/select.rs",
- range: Range {
- start: Position {
- line: 103,
- character: 17,
- },
- end: Position {
- line: 103,
- character: 29,
- },
- },
- },
- diagnostic: Diagnostic {
- range: Range {
- start: Position {
- line: 103,
- character: 17,
- },
- end: Position {
- line: 103,
- character: 29,
- },
- },
- severity: Some(
- Error,
- ),
- code: Some(
- String(
- "E0061",
- ),
- ),
- source: Some(
- "rustc",
- ),
- message: "this function takes 2 parameters but 3 parameters were supplied\nexpected 2 parameters",
- related_information: Some(
- [
- DiagnosticRelatedInformation {
- location: Location {
- uri: "file:///test/compiler/ty/select.rs",
- range: Range {
- start: Position {
- line: 218,
- character: 4,
- },
- end: Position {
- line: 230,
- character: 5,
- },
- },
- },
- message: "defined here",
- },
- ],
- ),
- tags: None,
- },
- suggested_fixes: [],
-}
--
cgit v1.2.3