aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #3771bors[bot]2020-03-302-6/+5
|\ | | | | | | | | | | | | | | | | | | | | 3771: Use IntoIter r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Use IntoIterAleksey Kladov2020-03-302-6/+5
|/
* Merge #3761bors[bot]2020-03-302-35/+164
|\ | | | | | | | | | | | | | | 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 <[email protected]>
| * Tidy up insertion position logicMatthew Hall2020-03-291-20/+6
| |
| * Remove unneeded variablesMatthew Hall2020-03-291-4/+2
| |
| * Remove "TODO" in comment in testMatthew Hall2020-03-281-4/+4
| |
| * Append new match arms rather than replacing all of themMatthew Hall2020-03-282-35/+180
| | | | | | | | This means we now retain comments when filling in match arms.
* | Merge #3763bors[bot]2020-03-301-11/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 3763: Simplify r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]>
| * | Simplifyveetaha2020-03-281-11/+4
| |/
* | Merge #3770bors[bot]2020-03-303-17/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3770: Pull options outwards r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Pull options outwardsAleksey Kladov2020-03-303-17/+14
| | |
* | | Merge #3754bors[bot]2020-03-305-44/+23
|\| | | | | | | | | | | | | | | | | | | | | | | 3754: Use automatic thread joining for cargo-watch r=matklad a=matklad r? @kiljacken Co-authored-by: Aleksey Kladov <[email protected]>
| * | Fix race in the testsAleksey Kladov2020-03-303-2/+11
| | |
| * | Use automatic thread joining for cargo-watchAleksey Kladov2020-03-303-40/+10
| | |
| * | :arrow_up: jod-threadAleksey Kladov2020-03-301-2/+2
|/ /
* | Merge pull request #3769 from matklad/btAleksey Kladov2020-03-301-0/+1
|\ \ | | | | | | Enable backtrace on CI
| * | Enable backtrace on CIAleksey Kladov2020-03-301-0/+1
| |/
* | Merge #3764bors[bot]2020-03-302-26/+26
|\ \ | |/ |/| | | | | | | | | | | | | | | 3764: Move roots_to_scan to LoopState r=matklad a=edwin0cheng closes #3760 cc @lnicola Co-authored-by: Edwin Cheng <[email protected]>
| * Fix review commentsEdwin Cheng2020-03-292-13/+13
| |
| * Move roots_to_scan to LoopStateEdwin Cheng2020-03-282-22/+22
|/
* Merge #3756bors[bot]2020-03-281-1/+1
|\ | | | | | | | | | | | | | | 3756: Update docs to mention vscode installation path on Windows r=edwin0cheng a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| * Update docs to mention on WindowsEdwin Cheng2020-03-281-1/+1
|/
* Merge #3755bors[bot]2020-03-281-1/+1
|\ | | | | | | | | | | | | | | | | 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 <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
| * Update docs/user/readme.adocAleksey Kladov2020-03-281-1/+1
| | | | | | Co-Authored-By: Laurențiu Nicola <[email protected]>
| * Update docs to mention vscode installation path on macOSMariusz Klochowicz2020-03-281-1/+1
|/
* Merge #3753bors[bot]2020-03-2827-153/+229
|\ | | | | | | | | | | | | | | | | 3753: Introduce stdx crate r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Remove some unwrapsAleksey Kladov2020-03-285-29/+29
| |
| * Nice string formattingAleksey Kladov2020-03-2811-21/+38
| |
| * Start stdxAleksey Kladov2020-03-2813-104/+163
|/ | | | This crate will hold everything to small to be worth publishing
* Merge #3745bors[bot]2020-03-273-2/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
| * Fix merge-imports assist for wildcard importsPiotr Szpetkowski2020-03-273-2/+36
|/
* Merge #3743bors[bot]2020-03-272-5/+9
|\ | | | | | | | | | | | | | | | | | | | | 3743: Fix assist description r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Fix assist descriptionAleksey Kladov2020-03-272-5/+9
|/
* Merge #3742bors[bot]2020-03-276-5/+170
|\ | | | | | | | | | | | | | | | | | | | | 3742: Replace if with if-let r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * Replace if with if-letAleksey Kladov2020-03-276-5/+170
| |
* | Merge #3741bors[bot]2020-03-272-2/+11
|\| | | | | | | | | | | | | | | | | | | | | 3741: More general ctor for ifs r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * More general ctor for ifsAleksey Kladov2020-03-272-2/+11
| |
* | Merge #3740bors[bot]2020-03-271-29/+28
|\| | | | | | | | | | | | | | | | | | | | | 3740: Simplify r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * SimplifyAleksey Kladov2020-03-271-29/+28
| |
* | Merge #3693bors[bot]2020-03-271-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 3693: vscode: show release tag with along with the commit hash for RA version command r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]> Co-authored-by: Veetaha <[email protected]>
| * | vscode: fix release tag retrievalVeetaha2020-03-271-1/+1
| | | | | | | | | Co-Authored-By: Laurențiu Nicola <[email protected]>
| * | vscode: show release tag with along with the commit hash for RA version commandveetaha2020-03-261-2/+7
|/ /
* | Merge #3725bors[bot]2020-03-262-23/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | 3725: vscode: fix local devel and remove disposables memory leak on server restrart r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]>
| * | vscode: small post-refactorveetaha2020-03-261-3/+1
| | |
| * | vscode: fix memory leak on server restartveetaha2020-03-261-15/+13
| | | | | | | | | | | | The memory leak was because on the server restrart the array of extensionContext.substiptions was not cleared
| * | vscode: fix local develveetaha2020-03-262-5/+7
| | | | | | | | | | | | The value of releaseTag is not undefined, but null in actual package.json
* | | Merge #3727bors[bot]2020-03-2620-38/+259
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3727: Introduce ra_proc_macro r=matklad a=edwin0cheng This PR implemented: 1. Reading dylib path of proc-macro crate from cargo check , similar to how `OUTDIR` is obtained. 2. Added a new crate `ra_proc_macro` and implement the foot-work for reading result from external proc-macro expander. 3. Added a struct `ProcMacroClient` , which will be responsible to the client side communication to the External process. Co-authored-by: Edwin Cheng <[email protected]>
| * | | Remove deps on tt_mbeEdwin Cheng2020-03-2610-49/+58
| | | |
| * | | Refactoring a bitEdwin Cheng2020-03-261-7/+12
| | | |
| * | | Add ProcMacroClientEdwin Cheng2020-03-2517-43/+222
| | | |