Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit d303b59

Browse files
authored
Merge pull request #1224 from Xanewok/update-ls-types
Update languageserver-types to 0.51.1
2 parents 300905b + f493e85 commit d303b59

File tree

2 files changed

+3
-24
lines changed

2 files changed

+3
-24
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ failure = "0.1.1"
1919
home = "0.3"
2020
itertools = "0.7.3"
2121
jsonrpc-core = "9"
22-
languageserver-types = "0.51"
22+
languageserver-types = "0.51.1"
2323
lazy_static = "1"
2424
log = "0.4"
2525
num_cpus = "1"

src/actions/hover.rs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,26 +1023,6 @@ pub mod test {
10231023
data: Result<Vec<MarkedString>, String>,
10241024
}
10251025

1026-
// MarkedString nad LanguageString don't implement clone
1027-
impl Clone for TestResult {
1028-
fn clone(&self) -> TestResult {
1029-
let ls_clone = |ls: &LanguageString| LanguageString {
1030-
language: ls.language.clone(),
1031-
value: ls.value.clone(),
1032-
};
1033-
let ms_clone = |ms: &MarkedString| match ms {
1034-
MarkedString::String(ref s) => MarkedString::String(s.clone()),
1035-
MarkedString::LanguageString(ref ls) => MarkedString::LanguageString(ls_clone(ls)),
1036-
};
1037-
let test = self.test.clone();
1038-
let data = match self.data {
1039-
Ok(ref data) => Ok(data.iter().map(|ms| ms_clone(ms)).collect()),
1040-
Err(ref e) => Err(e.clone()),
1041-
};
1042-
TestResult { test, data }
1043-
}
1044-
}
1045-
10461026
impl TestResult {
10471027
fn save(&self, result_dir: &Path) -> Result<(), String> {
10481028
let path = self.test.path(result_dir);
@@ -1265,9 +1245,8 @@ pub mod test {
12651245
}).collect();
12661246

12671247
let failures: Vec<TestFailure> = results
1268-
.iter()
1269-
.map(|actual_result: &TestResult| {
1270-
let actual_result = actual_result.clone();
1248+
.into_iter()
1249+
.map(|actual_result| {
12711250
match actual_result.test.load_result(&load_dir) {
12721251
Ok(expect_result) => {
12731252
if actual_result.test != expect_result.test {

0 commit comments

Comments
 (0)