From d0b2ca36e7d9d7fe6f0c4ee065c1ea79de9f52ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20F=C3=B6rster?=
 <pfoerster@users.noreply.github.com>
Date: Sat, 8 Jun 2019 09:31:54 +0200
Subject: [PATCH] Fix compilation error in integration tests

---
 tests/completion.rs      | 26 +++++++++++++-------------
 tests/synchronization.rs |  3 ++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/completion.rs b/tests/completion.rs
index 815400ce0..a4732302d 100644
--- a/tests/completion.rs
+++ b/tests/completion.rs
@@ -22,7 +22,7 @@ pub async fn run(scenario: &'static str, file: &'static str, position: Position)
         .unwrap()
         .items
         .into_iter()
-        .map(|item| item.label.into_owned())
+        .map(|item| (*item.label).to_owned())
         .sorted()
         .collect()
 }
@@ -80,7 +80,7 @@ fn test_citation() {
 fn test_symbol_command_kernel() {
     block_on(async move {
         let items = run("symbol", "foo.tex", Position::new(0, 1)).await;
-        assert_eq!(items.iter().any(|item| item == "varepsilon"), true);
+        assert!(items.iter().any(|item| item == "varepsilon"));
     });
 }
 
@@ -97,7 +97,7 @@ fn test_symbol_argument() {
 fn test_color() {
     block_on(async move {
         let items = run("color", "foo.tex", Position::new(0, 10)).await;
-        assert_eq!(items.iter().any(|item| item == "black"), true);
+        assert!(items.iter().any(|item| item == "black"));
     });
 }
 
@@ -105,7 +105,7 @@ fn test_color() {
 fn test_color_model() {
     block_on(async move {
         let items = run("color", "foo.tex", Position::new(1, 18)).await;
-        assert_eq!(items.iter().any(|item| item == "rgb"), true);
+        assert!(items.iter().any(|item| item == "rgb"));
     });
 }
 
@@ -153,7 +153,7 @@ fn test_include_graphics_svg() {
 fn test_import_class() {
     block_on(async move {
         let items = run("import", "foo.tex", Position::new(0, 18)).await;
-        assert_eq!(items.iter().any(|item| item == "article"), true);
+        assert!(items.iter().any(|item| item == "article"));
     });
 }
 
@@ -161,7 +161,7 @@ fn test_import_class() {
 fn test_import_package() {
     block_on(async move {
         let items = run("import", "foo.tex", Position::new(1, 15)).await;
-        assert_eq!(items.iter().any(|item| item == "amsmath"), true);
+        assert!(items.iter().any(|item| item == "amsmath"));
     });
 }
 
@@ -169,7 +169,7 @@ fn test_import_package() {
 fn test_pgf_library() {
     block_on(async move {
         let items = run("pgf_library", "foo.tex", Position::new(0, 18)).await;
-        assert_eq!(items.iter().any(|item| item == "arrows"), true);
+        assert!(items.iter().any(|item| item == "arrows"));
     });
 }
 
@@ -177,7 +177,7 @@ fn test_pgf_library() {
 fn test_tikz_library() {
     block_on(async move {
         let items = run("tikz_library", "foo.tex", Position::new(0, 19)).await;
-        assert_eq!(items.iter().any(|item| item == "arrows"), true);
+        assert!(items.iter().any(|item| item == "arrows"));
     });
 }
 
@@ -185,7 +185,7 @@ fn test_tikz_library() {
 fn test_entry_type() {
     block_on(async move {
         let items = run("entry_type", "foo.bib", Position::new(0, 1)).await;
-        assert_eq!(items.iter().any(|item| item == "article"), true);
+        assert!(items.iter().any(|item| item == "article"));
     });
 }
 
@@ -193,7 +193,7 @@ fn test_entry_type() {
 fn test_entry_type_preamble() {
     block_on(async move {
         let items = run("entry_type", "foo.bib", Position::new(1, 3)).await;
-        assert_eq!(items.iter().any(|item| item == "preamble"), true);
+        assert!(items.iter().any(|item| item == "preamble"));
     });
 }
 
@@ -201,7 +201,7 @@ fn test_entry_type_preamble() {
 fn test_entry_type_string() {
     block_on(async move {
         let items = run("entry_type", "foo.bib", Position::new(2, 3)).await;
-        assert_eq!(items.iter().any(|item| item == "string"), true);
+        assert!(items.iter().any(|item| item == "string"));
     });
 }
 
@@ -209,7 +209,7 @@ fn test_entry_type_string() {
 fn test_entry_type_comment() {
     block_on(async move {
         let items = run("entry_type", "foo.bib", Position::new(3, 3)).await;
-        assert_eq!(items.iter().any(|item| item == "comment"), true);
+        assert!(items.iter().any(|item| item == "comment"));
     });
 }
 
@@ -217,6 +217,6 @@ fn test_entry_type_comment() {
 fn test_field_name() {
     block_on(async move {
         let items = run("field_name", "foo.bib", Position::new(1, 7)).await;
-        assert_eq!(items.iter().any(|item| item == "author"), true);
+        assert!(items.iter().any(|item| item == "author"));
     });
 }
diff --git a/tests/synchronization.rs b/tests/synchronization.rs
index 40e167f02..10f0eb0fa 100644
--- a/tests/synchronization.rs
+++ b/tests/synchronization.rs
@@ -4,12 +4,13 @@ use futures::executor::block_on;
 use jsonrpc::server::ActionHandler;
 use lsp_types::*;
 use texlab::scenario::Scenario;
+use std::sync::Arc;
 
 async fn run_completion(
     scenario: &Scenario,
     file: &'static str,
     position: Position,
-) -> Vec<CompletionItem> {
+) -> Vec<Arc<CompletionItem>> {
     let params = CompletionParams {
         text_document: TextDocumentIdentifier::new(scenario.uri(file)),
         position,