aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-12-30 20:33:04 +0000
committerAleksey Kladov <[email protected]>2018-12-30 20:33:04 +0000
commitf0edb93df2e282146e86174a5b129039cc6fce0a (patch)
tree90e6c9bc5bf402485ed42c14ca51a067f867cb6f
parentbb604f0a255078a6b30555a5535ee1d277237e38 (diff)
:arrow_up: tempdir
-rw-r--r--Cargo.lock23
-rw-r--r--crates/ra_lsp_server/Cargo.toml2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/support.rs4
3 files changed, 4 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 8e962d352..a899e4912 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -785,7 +785,7 @@ dependencies = [
785 "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)", 785 "serde 1.0.83 (registry+https://github.com/rust-lang/crates.io-index)",
786 "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", 786 "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
787 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", 787 "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
788 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", 788 "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
789 "test_utils 0.1.0", 789 "test_utils 0.1.0",
790 "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", 790 "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
791 "thread_worker 0.1.0", 791 "thread_worker 0.1.0",
@@ -835,16 +835,6 @@ dependencies = [
835 835
836[[package]] 836[[package]]
837name = "rand" 837name = "rand"
838version = "0.4.3"
839source = "registry+https://github.com/rust-lang/crates.io-index"
840dependencies = [
841 "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
842 "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
843 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
844]
845
846[[package]]
847name = "rand"
848version = "0.5.5" 838version = "0.5.5"
849source = "registry+https://github.com/rust-lang/crates.io-index" 839source = "registry+https://github.com/rust-lang/crates.io-index"
850dependencies = [ 840dependencies = [
@@ -1208,15 +1198,6 @@ dependencies = [
1208] 1198]
1209 1199
1210[[package]] 1200[[package]]
1211name = "tempdir"
1212version = "0.3.7"
1213source = "registry+https://github.com/rust-lang/crates.io-index"
1214dependencies = [
1215 "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
1216 "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
1217]
1218
1219[[package]]
1220name = "tempfile" 1201name = "tempfile"
1221version = "3.0.5" 1202version = "3.0.5"
1222source = "registry+https://github.com/rust-lang/crates.io-index" 1203source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1606,7 +1587,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1606"checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f" 1587"checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f"
1607"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" 1588"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
1608"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" 1589"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
1609"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
1610"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" 1590"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
1611"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" 1591"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a"
1612"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a" 1592"checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"
@@ -1650,7 +1630,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1650"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" 1630"checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741"
1651"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc" 1631"checksum syn 0.15.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9545a6a093a3f0bd59adb472700acc08cad3776f860f16a897dfce8c88721cbc"
1652"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" 1632"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
1653"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
1654"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" 1633"checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2"
1655"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3" 1634"checksum tera 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)" = "4b505279e19d8f7d24b1a9dc58327c9c36174b1a2c7ebdeac70792d017cb64f3"
1656"checksum teraron 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d89ad4617d1dec55331067fadaa041e813479e1779616f3d3ce9308bf46184e" 1635"checksum teraron 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d89ad4617d1dec55331067fadaa041e813479e1779616f3d3ce9308bf46184e"
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml
index 646df2497..b1a4cdaa1 100644
--- a/crates/ra_lsp_server/Cargo.toml
+++ b/crates/ra_lsp_server/Cargo.toml
@@ -35,6 +35,6 @@ gen_lsp_server = { path = "../gen_lsp_server" }
35ra_vfs = { path = "../ra_vfs" } 35ra_vfs = { path = "../ra_vfs" }
36 36
37[dev-dependencies] 37[dev-dependencies]
38tempdir = "0.3.7" 38tempfile = "3"
39test_utils = { path = "../test_utils" } 39test_utils = { path = "../test_utils" }
40tools = { path = "../tools" } 40tools = { path = "../tools" }
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index c14d287ca..0f7152140 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -16,7 +16,7 @@ use languageserver_types::{
16}; 16};
17use serde::Serialize; 17use serde::Serialize;
18use serde_json::{to_string_pretty, Value}; 18use serde_json::{to_string_pretty, Value};
19use tempdir::TempDir; 19use tempfile::TempDir;
20use thread_worker::{WorkerHandle, Worker}; 20use thread_worker::{WorkerHandle, Worker};
21use test_utils::{parse_fixture, find_mismatch}; 21use test_utils::{parse_fixture, find_mismatch};
22 22
@@ -28,7 +28,7 @@ pub fn project(fixture: &str) -> Server {
28 static INIT: Once = Once::new(); 28 static INIT: Once = Once::new();
29 INIT.call_once(|| Logger::with_env_or_str(crate::LOG).start().unwrap()); 29 INIT.call_once(|| Logger::with_env_or_str(crate::LOG).start().unwrap());
30 30
31 let tmp_dir = TempDir::new("test-project").unwrap(); 31 let tmp_dir = TempDir::new().unwrap();
32 let mut paths = vec![]; 32 let mut paths = vec![];
33 33
34 for entry in parse_fixture(fixture) { 34 for entry in parse_fixture(fixture) {