From d0c3e3a05330390f43e1dca56f898a40d4857865 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 20 Jul 2018 15:44:30 +0300
Subject: [PATCH] Make the workspace hack local to RLS

cc https://github.com/rust-lang/rust/pull/42146
---
 .gitignore           | 1 +
 src/test/lens.rs     | 1 -
 test_data/Cargo.toml | 5 +++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test_data/Cargo.toml

diff --git a/.gitignore b/.gitignore
index 665657d11ba..b2f26765566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .idea
 
 target
+test_data/Cargo.lock
diff --git a/src/test/lens.rs b/src/test/lens.rs
index 6e479f2f322..d11e965e702 100644
--- a/src/test/lens.rs
+++ b/src/test/lens.rs
@@ -15,7 +15,6 @@ use crate::{
 };
 
 #[test]
-#[ignore] // FIXME(#925) intermittent failure
 fn test_lens_run() {
     let mut env = Environment::new("lens_run");
 
diff --git a/test_data/Cargo.toml b/test_data/Cargo.toml
new file mode 100644
index 00000000000..c48b71e244f
--- /dev/null
+++ b/test_data/Cargo.toml
@@ -0,0 +1,5 @@
+# Make sure that test are not accidentally become members of
+# the main workspace in the rust-lang/rust repository
+[workspace]
+members = ["./*/"]
+exclude = ["./compiler_message", "./target"]