Commit graph

8796 commits

Author SHA1 Message Date
Kirill Bulatov b892a48740 Code review fixes
Co-Authored-By: Veetaha <veetaha2@gmail.com>
2020-03-30 13:39:14 +03:00
Kirill Bulatov 590af37bff Small style fix
Co-Authored-By: Veetaha <veetaha2@gmail.com>
2020-03-30 13:39:14 +03:00
Kirill Bulatov 392eb74b5f Remove an obsolete fixme 2020-03-30 13:39:14 +03:00
Kirill Bulatov bbe59c7197 Reload watcher configuration 2020-03-30 13:39:14 +03:00
Kirill Bulatov 8a23bec2cd Style fixes 2020-03-30 13:39:14 +03:00
Kirill Bulatov 332799d914 Reload only the properties that do not affect vfs 2020-03-30 13:39:14 +03:00
Kirill Bulatov 2feaef91bd Read new config on the server side 2020-03-30 13:39:14 +03:00
Kirill Bulatov a9dd442733 Send the config from the client 2020-03-30 13:39:14 +03:00
Kirill Bulatov 019f269a0a Process configuration response draft 2020-03-30 13:39:14 +03:00
Kirill Bulatov 8c4aab0c80 Client side draft 2020-03-30 13:39:14 +03:00
bors[bot] 9e12b9e6fd
Merge #3771
3771: Use IntoIter r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-30 10:30:23 +00:00
Aleksey Kladov 0cfa9eb445 Use IntoIter 2020-03-30 12:28:22 +02:00
bors[bot] d2ea3f25b5
Merge #3761
3761: Append new match arms rather than replacing all of them r=matklad a=mattyhall

This means we now retain comments when filling in match arms. This fixes #3687. This is my first contribution so apologies if it needs a rethink! I think in particular the way I find the position to append to and remove_if_only_whitespace are a little hairy.

Co-authored-by: Matthew Hall <matthew@quickbeam.me.uk>
2020-03-30 10:19:02 +00:00
bors[bot] 3901198e87
Merge #3763
3763: Simplify r=matklad a=Veetaha



Co-authored-by: veetaha <veetaha2@gmail.com>
2020-03-30 09:57:40 +00:00
bors[bot] 78a2678b6d
Merge #3770
3770: Pull options outwards r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-30 09:48:50 +00:00
Aleksey Kladov 4c9272583c Pull options outwards 2020-03-30 11:46:04 +02:00
bors[bot] df8752bf3f
Merge #3754
3754: Use automatic thread joining for cargo-watch r=matklad a=matklad

r? @kiljacken 

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-30 09:33:43 +00:00
Aleksey Kladov 12297ab675 Fix race in the tests 2020-03-30 11:33:01 +02:00
Aleksey Kladov f7df0b56a7 Use automatic thread joining for cargo-watch 2020-03-30 11:33:01 +02:00
Aleksey Kladov 8bea5ace7e ⬆️ jod-thread 2020-03-30 11:33:01 +02:00
Aleksey Kladov 846cbe7d4e
Merge pull request #3769 from matklad/bt
Enable backtrace on CI
2020-03-30 10:51:59 +02:00
Aleksey Kladov 700ac8159a Enable backtrace on CI 2020-03-30 10:49:11 +02:00
bors[bot] 6677ccdb18
Merge #3764
3764: Move roots_to_scan to LoopState r=matklad a=edwin0cheng

closes #3760

cc @lnicola 

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2020-03-30 08:41:02 +00:00
Edwin Cheng 36812b9d7b Fix review comments 2020-03-30 02:39:03 +08:00
Matthew Hall ddb9cc47d1 Tidy up insertion position logic 2020-03-29 12:45:15 +01:00
Matthew Hall b8b271d984 Remove unneeded variables 2020-03-29 12:32:01 +01:00
Edwin Cheng dc0076de12 Move roots_to_scan to LoopState 2020-03-29 06:33:16 +08:00
veetaha 3d73345cdb Simplify 2020-03-28 23:48:37 +02:00
Matthew Hall 77bb9a56f1 Remove "TODO" in comment in test 2020-03-28 21:24:26 +00:00
Matthew Hall ecc2615ba2 Append new match arms rather than replacing all of them
This means we now retain comments when filling in match arms.
2020-03-28 20:58:46 +00:00
bors[bot] 1c2d4135db
Merge #3756
3756: Update docs to mention vscode installation path on Windows r=edwin0cheng a=edwin0cheng



Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2020-03-28 13:04:46 +00:00
Edwin Cheng df68373c8e Update docs to mention on Windows 2020-03-28 21:04:02 +08:00
bors[bot] 5749554b07
Merge #3755
3755: Update docs to mention vscode installation path on macOS r=matklad a=klochowicz

It took me a while to find it on macOS so I thought I'd spare the effort for others ;)

Co-authored-by: Mariusz Klochowicz <klochowicz@pm.me>
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-28 11:56:19 +00:00
Aleksey Kladov 1cf27b2e78
Update docs/user/readme.adoc
Co-Authored-By: Laurențiu Nicola <lnicola@users.noreply.github.com>
2020-03-28 12:55:56 +01:00
Mariusz Klochowicz 92412bc3be Update docs to mention vscode installation path on macOS 2020-03-28 22:16:19 +10:30
bors[bot] c30425dc96
Merge #3753
3753: Introduce stdx crate r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-28 11:28:31 +00:00
Aleksey Kladov 311cbbdad5 Remove some unwraps 2020-03-28 12:27:54 +01:00
Aleksey Kladov 6596e7cddf Nice string formatting 2020-03-28 12:27:54 +01:00
Aleksey Kladov b764c38436 Start stdx
This crate will hold everything to small to be worth publishing
2020-03-28 11:01:25 +01:00
bors[bot] a1fea0d34e
Merge #3745
3745: Fix merge-imports assist for wildcard imports r=matklad a=piotr-szpetkowski

Refs #3728 

Besides the case mentioned in issue merging two diff-prefix wildcard uses will now work as well e.g. 

```rust
use std::cell::*;
use std::str::*;
```

will translate into:

```rust
use std::{cell::*, str::*}
```

I'd also like to explore usage of the `merge-imports` for same-prefix uses to simplify redundancy, but it seems like an idea for another issue and I'm not sure if it's something that this assist should do e.g.:

```rust
use std::cell::Cell;
use std::cell::*;
```

into:

```rust
use std::cell::*;
```

Co-authored-by: Piotr Szpetkowski <piotr.szpetkowski@pyquest.space>
2020-03-27 18:55:05 +00:00
Piotr Szpetkowski f016d8b900
Fix merge-imports assist for wildcard imports 2020-03-27 17:28:25 +01:00
bors[bot] 75f6ab208a
Merge #3743
3743: Fix assist description r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-27 12:23:58 +00:00
Aleksey Kladov dc311b10f3 Fix assist description 2020-03-27 13:23:19 +01:00
bors[bot] a4901fdcfd
Merge #3742
3742: Replace if with if-let r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-27 11:21:57 +00:00
Aleksey Kladov 91e482b46d Replace if with if-let 2020-03-27 12:15:46 +01:00
bors[bot] f9cf86475c
Merge #3741
3741: More general ctor for ifs r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-27 10:38:31 +00:00
Aleksey Kladov cbb53cf55c More general ctor for ifs 2020-03-27 11:38:00 +01:00
bors[bot] 31528620a8
Merge #3740
3740: Simplify r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-03-27 10:27:01 +00:00
Aleksey Kladov d953df319b Simplify 2020-03-27 11:25:11 +01:00
bors[bot] 6aa18de98e
Merge #3693
3693: vscode: show release tag with along with the commit hash for RA version command r=matklad a=Veetaha



Co-authored-by: veetaha <veetaha2@gmail.com>
Co-authored-by: Veetaha <veetaha2@gmail.com>
2020-03-27 09:15:42 +00:00