]> git.lizzy.rs Git - rust.git/log
rust.git
4 years agoMerge #4733
bors[bot] [Wed, 3 Jun 2020 13:54:52 +0000 (13:54 +0000)]
Merge #4733

4733: Cargo update r=kjeremy a=kjeremy

Co-authored-by: kjeremy <kjeremy@gmail.com>
4 years agoCargo update
kjeremy [Wed, 3 Jun 2020 13:43:27 +0000 (09:43 -0400)]
Cargo update

4 years agoMerge #4502
bors[bot] [Wed, 3 Jun 2020 13:39:30 +0000 (13:39 +0000)]
Merge #4502

4502: Mark fixes from diagnostics as quick fixes r=kjeremy a=kjeremy

Populates the diagnostic UI with fixes:

Before:
![quickfix-before](https://user-images.githubusercontent.com/4325700/82165183-0e38df00-9882-11ea-96cf-7dab5faec4d4.PNG)

After:
![image](https://user-images.githubusercontent.com/4325700/82165193-1a24a100-9882-11ea-97d7-be1b64b135e0.png)

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
4 years agoMark fixes from diagnostics as quick fixes
Jeremy Kolb [Mon, 18 May 2020 01:03:40 +0000 (21:03 -0400)]
Mark fixes from diagnostics as quick fixes

4 years agoMerge #4730
bors[bot] [Wed, 3 Jun 2020 13:18:12 +0000 (13:18 +0000)]
Merge #4730

4730: Document rust-project.json r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoDocument rust-project.json
Aleksey Kladov [Wed, 3 Jun 2020 12:48:38 +0000 (14:48 +0200)]
Document rust-project.json

4 years agoMerge #4678
bors[bot] [Wed, 3 Jun 2020 11:27:10 +0000 (11:27 +0000)]
Merge #4678

4678: Unsquish parameter types in tooltips for macro-generated functions r=aloucks a=aloucks

Note the missing whitespace between `:` and the parameter type.

Before:
![image](https://user-images.githubusercontent.com/221559/83364680-faf13d80-a370-11ea-96b7-a041969a4954.png)

After:
![image](https://user-images.githubusercontent.com/221559/83364685-03e20f00-a371-11ea-9668-4e6ebcb81947.png)

Co-authored-by: Aaron Loucks <aloucks@cofront.net>
4 years agoUse split1 when formatting function signature params
Aaron Loucks [Wed, 3 Jun 2020 11:26:15 +0000 (07:26 -0400)]
Use split1 when formatting function signature params

4 years agoMerge #4660
bors[bot] [Wed, 3 Jun 2020 11:05:52 +0000 (11:05 +0000)]
Merge #4660

4660: Enable hover and autocomplete docs on macro generated items r=aloucks a=aloucks

Enable hover and autocomplete docs on macro generated items. This de-sugars doc comments into `doc` attributes in some cases, but not all. Comments and `doc` attributes are then merged together.

This PR is essentially a partial implementation of what's being suggested #3182, but it's not all the way there yet. ~I still need to add unit tests~, but I wanted to first get feedback on whether or not this was an acceptable path forward.

Fixes #4564
Fixes #3984
Fixes #3180
Related #3182

![macro_item_docs](https://user-images.githubusercontent.com/221559/83336760-15012200-a284-11ea-8d0d-b6a615850044.gif)

Co-authored-by: Aaron Loucks <aloucks@cofront.net>
4 years agoUpdate generated feature docs
Aaron Loucks [Wed, 3 Jun 2020 10:55:27 +0000 (06:55 -0400)]
Update generated feature docs

4 years agoConsolidate documentation expansion and merging
Aaron Loucks [Wed, 3 Jun 2020 10:14:56 +0000 (06:14 -0400)]
Consolidate documentation expansion and merging

Removes the duplicated `expand_doc_attrs` and `merge_doc_comments_and_attrs`
functions from `ra_ide` and exposes the same functionality via
`ra_hir::Documentation::from_ast`.

4 years agoAdd basic hover and completion doc tests for macro generated items
Aaron Loucks [Sun, 31 May 2020 15:33:48 +0000 (11:33 -0400)]
Add basic hover and completion doc tests for macro generated items

4 years agoEnable hover and autocomplete docs on macro generated items
Aaron Loucks [Sat, 30 May 2020 18:21:06 +0000 (14:21 -0400)]
Enable hover and autocomplete docs on macro generated items

4 years agoMerge #4727
bors[bot] [Wed, 3 Jun 2020 10:40:12 +0000 (10:40 +0000)]
Merge #4727

4727: Drop test for old format r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoDrop test for old format
Aleksey Kladov [Wed, 3 Jun 2020 10:39:11 +0000 (12:39 +0200)]
Drop test for old format

4 years agoMerge #4726
bors[bot] [Wed, 3 Jun 2020 10:26:38 +0000 (10:26 +0000)]
Merge #4726

4726: Groundwork for specifying the set of projects via config r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoGroundwork for specifying the set of projects via config
Aleksey Kladov [Wed, 3 Jun 2020 10:22:01 +0000 (12:22 +0200)]
Groundwork for specifying the set of projects via config

4 years agoRename ProjectRoot -> ProjectManifest
Aleksey Kladov [Wed, 3 Jun 2020 10:05:50 +0000 (12:05 +0200)]
Rename ProjectRoot -> ProjectManifest

4 years agoMove project discovery
Aleksey Kladov [Wed, 3 Jun 2020 09:44:51 +0000 (11:44 +0200)]
Move project discovery

4 years agoMerge #4724
bors[bot] [Wed, 3 Jun 2020 09:20:30 +0000 (09:20 +0000)]
Merge #4724

4724: Rename WorldState -> GlobalState r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoRename WorldState -> GlobalState
Aleksey Kladov [Wed, 3 Jun 2020 09:16:08 +0000 (11:16 +0200)]
Rename WorldState -> GlobalState

4 years agoMerge #4723
bors[bot] [Wed, 3 Jun 2020 09:08:20 +0000 (09:08 +0000)]
Merge #4723

4723: Derive local roots from Workspaces r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoDrop no-project test
Aleksey Kladov [Wed, 3 Jun 2020 09:07:04 +0000 (11:07 +0200)]
Drop no-project test

Eventually, we should support "just open random rust file" use case,
we don't really do this now, so let's avoid spending time on it until
we fix it properly.

4 years agoDerive local roots from Workspaces
Aleksey Kladov [Wed, 3 Jun 2020 08:52:35 +0000 (10:52 +0200)]
Derive local roots from Workspaces

4 years agoPut important things on top
Aleksey Kladov [Wed, 3 Jun 2020 08:33:01 +0000 (10:33 +0200)]
Put important things on top

4 years agoMerge pull request #4382 from woody77/json_cfgs
Aleksey Kladov [Wed, 3 Jun 2020 08:28:15 +0000 (10:28 +0200)]
Merge pull request #4382 from woody77/json_cfgs

Begin transition to new fields for JsonProject crate cfgs

4 years agoMerge #4715
bors[bot] [Wed, 3 Jun 2020 07:15:18 +0000 (07:15 +0000)]
Merge #4715

4715: Don't exclude dirs that appear in project root parent path r=matklad a=Veetaha

Co-authored-by: veetaha <veetaha2@gmail.com>
4 years agoMerge #4679
bors[bot] [Wed, 3 Jun 2020 06:47:18 +0000 (06:47 +0000)]
Merge #4679

4679: Update a comment for the new source organization r=matklad a=nelhage

Co-authored-by: Nelson Elhage <nelhage@nelhage.com>
4 years agoMerge #4703
bors[bot] [Wed, 3 Jun 2020 06:29:33 +0000 (06:29 +0000)]
Merge #4703

4703: Start documenting review process r=matklad a=matklad

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoStart documenting review process
Aleksey Kladov [Tue, 2 Jun 2020 09:16:49 +0000 (11:16 +0200)]
Start documenting review process

4 years agoMerge #4721
bors[bot] [Wed, 3 Jun 2020 06:16:45 +0000 (06:16 +0000)]
Merge #4721

4721: Hide squiggly for unused and unnecessary diagnostics r=matklad a=GabbeV

Fixes #4229

When working with JavaScript or TypeScript in VSCode unused valiables are faded but don't have a squiggle. This PR makes rust-analyzer work similarly by setting the severity to hint when applying the unnecessary tag.

VSCode usually shows a squiggle for error, warning and information and shows three dots for hint. When the unnecessary tag is present the squiggles will still show up but the three dots will not.

This is my first contribution to open source. Please tell me if i need to do anything more to get this PR considered.

Co-authored-by: Gabriel Valfridsson <gabriel.valfridsson@gmail.com>
4 years agoHide squiggly for unused and unnecessary
Gabriel Valfridsson [Tue, 2 Jun 2020 22:51:23 +0000 (00:51 +0200)]
Hide squiggly for unused and unnecessary

4 years agoMerge #4720
bors[bot] [Tue, 2 Jun 2020 23:13:09 +0000 (23:13 +0000)]
Merge #4720

4720: Add highlight support for unsafe fn calls and raw ptr deref r=matklad a=Nashenas88

Addresses ide highlighting for #190

Co-authored-by: Paul Daniel Faria <Nashenas88@users.noreply.github.com>
4 years agoAdd highlight support for unsafe fn calls and raw ptr deref
Paul Daniel Faria [Tue, 2 Jun 2020 22:49:09 +0000 (18:49 -0400)]
Add highlight support for unsafe fn calls and raw ptr deref

4 years agoMerge #4710
bors[bot] [Tue, 2 Jun 2020 20:44:56 +0000 (20:44 +0000)]
Merge #4710

4710: New runnables r=matklad a=matklad

bors d=@vsrs

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoDon't exclude dirs that appear in project root parent path
veetaha [Tue, 2 Jun 2020 20:15:23 +0000 (23:15 +0300)]
Don't exclude dirs that appear in project root parent path

4 years agoMerge #4711
bors[bot] [Tue, 2 Jun 2020 16:16:38 +0000 (16:16 +0000)]
Merge #4711

4711: Disable rust-analyzer.{cargo,checkOnSave}.allFeatures by default r=matklad a=lnicola

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
4 years agoDisable rust-analyzer.{cargo,checkOnSave}.allFeatures by default
Laurențiu Nicola [Tue, 2 Jun 2020 09:24:33 +0000 (12:24 +0300)]
Disable rust-analyzer.{cargo,checkOnSave}.allFeatures by default

4 years agoFix tests
Aleksey Kladov [Tue, 2 Jun 2020 16:02:58 +0000 (18:02 +0200)]
Fix tests

4 years agoSpec better runnables
Aleksey Kladov [Tue, 2 Jun 2020 15:34:18 +0000 (17:34 +0200)]
Spec better runnables

4 years agoNew runnables API
Aleksey Kladov [Tue, 2 Jun 2020 15:22:23 +0000 (17:22 +0200)]
New runnables API

4 years agoMerge #4709
bors[bot] [Tue, 2 Jun 2020 14:31:10 +0000 (14:31 +0000)]
Merge #4709

4709: Minor r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoMinor
Aleksey Kladov [Tue, 2 Jun 2020 14:30:26 +0000 (16:30 +0200)]
Minor

4 years agoMerge #4708
bors[bot] [Tue, 2 Jun 2020 12:53:24 +0000 (12:53 +0000)]
Merge #4708

4708: Move run commands to commands.ts r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoMove run commands to commands.ts
Aleksey Kladov [Tue, 2 Jun 2020 12:33:47 +0000 (14:33 +0200)]
Move run commands to commands.ts

4 years agoMerge #4658
bors[bot] [Tue, 2 Jun 2020 12:13:02 +0000 (12:13 +0000)]
Merge #4658

4658: Fix problem with format string tokenization r=matklad a=ruabmbua

Fixed by just not handling closing curlybrace escaping.

Closes https://github.com/rust-analyzer/rust-analyzer/issues/4637

Co-authored-by: Roland Ruckerbauer <roland.rucky@gmail.com>
4 years agoMerge #4580
bors[bot] [Tue, 2 Jun 2020 11:58:28 +0000 (11:58 +0000)]
Merge #4580

4580: Fix invoking cargo without consulting CARGO env var or standard installation paths r=matklad a=Veetaha

Followup for #4329

The pr essentially fixes [this bug](https://youtu.be/EzQ7YIIo1rY?t=2189)

cc @lefticus

Co-authored-by: veetaha <veetaha2@gmail.com>
4 years agoMerge #4701
bors[bot] [Tue, 2 Jun 2020 01:19:58 +0000 (01:19 +0000)]
Merge #4701

4701: Simplify r=kjeremy a=Veetaha

Co-authored-by: veetaha <veetaha2@gmail.com>
4 years agoSimplify
veetaha [Mon, 1 Jun 2020 23:50:05 +0000 (02:50 +0300)]
Simplify

4 years agoMerge #4688
bors[bot] [Mon, 1 Jun 2020 15:51:46 +0000 (15:51 +0000)]
Merge #4688

4688: Document initilizationOptions used by rust-analyzer r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoSubscribe to protocol changes
Aleksey Kladov [Mon, 1 Jun 2020 15:51:15 +0000 (17:51 +0200)]
Subscribe to protocol changes

4 years agoDocument initilizationOptions used by rust-analyzer
Aleksey Kladov [Mon, 1 Jun 2020 15:42:46 +0000 (17:42 +0200)]
Document initilizationOptions used by rust-analyzer

4 years agoMerge #4686
bors[bot] [Mon, 1 Jun 2020 15:29:52 +0000 (15:29 +0000)]
Merge #4686

4686: Drop unused document r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoDrop unused document
Aleksey Kladov [Mon, 1 Jun 2020 15:29:24 +0000 (17:29 +0200)]
Drop unused document

4 years agoMerge #4682
bors[bot] [Mon, 1 Jun 2020 13:41:41 +0000 (13:41 +0000)]
Merge #4682

4682: Rename assist r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoRename assist
Aleksey Kladov [Mon, 1 Jun 2020 13:36:51 +0000 (15:36 +0200)]
Rename assist

4 years agoCleanup imports
Aleksey Kladov [Mon, 1 Jun 2020 13:35:02 +0000 (15:35 +0200)]
Cleanup imports

4 years agoUpdate a comment for the new source organization
Nelson Elhage [Sun, 31 May 2020 23:04:52 +0000 (16:04 -0700)]
Update a comment for the new source organization

4 years agoUnsquish parameter types in tooltips for macro-generated functions
Aaron Loucks [Sun, 31 May 2020 22:58:54 +0000 (18:58 -0400)]
Unsquish parameter types in tooltips for macro-generated functions

4 years agoMerge #4675
bors[bot] [Sun, 31 May 2020 21:09:24 +0000 (21:09 +0000)]
Merge #4675

4675: Small refactor r=kiljacken a=Veetaha

Co-authored-by: veetaha <veetaha2@gmail.com>
4 years agoSmall refactor
veetaha [Sun, 31 May 2020 18:39:19 +0000 (21:39 +0300)]
Small refactor

4 years agoMerge #4674
bors[bot] [Sun, 31 May 2020 17:07:37 +0000 (17:07 +0000)]
Merge #4674

4674: Recursively search submodules to find modules in which a definition is visible. r=matklad a=umanwizard

Co-authored-by: Brennan Vincent <brennan@materialize.io>
4 years agoMerge #4669
bors[bot] [Sun, 31 May 2020 16:58:57 +0000 (16:58 +0000)]
Merge #4669

4669: Always derive from `process.env` when spawning a child process/shell execution r=matklad a=Dfinity-Alin

This is useful when an extension (e.g. [Nix Environment Selector](https://marketplace.visualstudio.com/items?itemName=arrterian.nix-env-selector)) or [launch
configuration](https://stackoverflow.com/questions/57641460/set-env-var-for-node-js-when-launching-through-vs-code) sets one or more environment variables.

When `env` is not explicitly specified in the options passed to
`child_process.spawn()` or `vscode.ShellExecution()`, then `process.env` gets
applied automatically. But when an explicit `env` is set, it should inherit from
`process.env` rather than replace it completely.

Co-authored-by: Alin Sinpalean <alin.sinpalean@dfinity.org>
4 years agoadd test
Brennan Vincent [Sun, 31 May 2020 16:21:45 +0000 (12:21 -0400)]
add test

4 years agorecursively search submodules
Brennan Vincent [Sun, 31 May 2020 16:01:49 +0000 (12:01 -0400)]
recursively search submodules

4 years agoMerge #4673
bors[bot] [Sun, 31 May 2020 15:48:33 +0000 (15:48 +0000)]
Merge #4673

4673: Update deps r=kjeremy a=kjeremy

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
4 years agoUpdate deps
Jeremy Kolb [Sun, 31 May 2020 15:38:09 +0000 (11:38 -0400)]
Update deps

4 years agoMerge #4672
bors[bot] [Sun, 31 May 2020 13:36:52 +0000 (13:36 +0000)]
Merge #4672

4672: Link docs and code r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoLink to the specific source line
Aleksey Kladov [Sun, 31 May 2020 13:36:20 +0000 (15:36 +0200)]
Link to the specific source line

4 years agoMerge #4671
bors[bot] [Sun, 31 May 2020 13:20:52 +0000 (13:20 +0000)]
Merge #4671

4671: docs r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agodocs
Aleksey Kladov [Sun, 31 May 2020 13:15:03 +0000 (15:15 +0200)]
docs

4 years agoMerge #4670
bors[bot] [Sun, 31 May 2020 13:03:55 +0000 (13:03 +0000)]
Merge #4670

4670: Move assists documentation into the manual r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoMove assists documentation into the manual
Aleksey Kladov [Sun, 31 May 2020 13:02:12 +0000 (15:02 +0200)]
Move assists documentation into the manual

4 years agoMerge #4667
bors[bot] [Sun, 31 May 2020 12:03:24 +0000 (12:03 +0000)]
Merge #4667

4667: Infer labelled breaks correctly r=flodiebold a=robojumper

Fixes #4663.

Co-authored-by: robojumper <robojumper@gmail.com>
4 years agoAlways derive from `process.env` when spawning a child process/shell execution
Alin Sinpalean [Sun, 31 May 2020 11:41:52 +0000 (13:41 +0200)]
Always derive from `process.env` when spawning a child process/shell execution

This is useful when an extension (e.g. Nix Environment Selector) or launch
configuration sets one or more environment variables.

When `env` is not explicitly specified in the options passed to
`child_process.spawn()` or `vscode.ShellExecution()`, then `process.env` gets
applied automatically. But when an explicit `env` is set, it should inherit from
`process.env` rather than replace it completely.

4 years agoMerge #4668
bors[bot] [Sun, 31 May 2020 11:22:40 +0000 (11:22 +0000)]
Merge #4668

4668: Rename user/readme.adoc -> user/manual.adoc r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoRename user/readme.adoc -> user/manual.adoc
Aleksey Kladov [Sun, 31 May 2020 11:22:02 +0000 (13:22 +0200)]
Rename user/readme.adoc -> user/manual.adoc

4 years agoMerge #4664
bors[bot] [Sun, 31 May 2020 10:50:11 +0000 (10:50 +0000)]
Merge #4664

4664: Generate feature documentation from code r=matklad a=matklad

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agoForce / slashes on windows
Aleksey Kladov [Sun, 31 May 2020 10:49:06 +0000 (12:49 +0200)]
Force / slashes on windows

4 years agoTweak whitespace
Aleksey Kladov [Sun, 31 May 2020 10:12:41 +0000 (12:12 +0200)]
Tweak whitespace

4 years agofmt
robojumper [Sun, 31 May 2020 10:06:22 +0000 (12:06 +0200)]
fmt

4 years agocorrectly infer labelled breaks
robojumper [Sun, 31 May 2020 08:59:40 +0000 (10:59 +0200)]
correctly infer labelled breaks

4 years agoMove the rest of the features to generated docs
Aleksey Kladov [Sun, 31 May 2020 09:29:19 +0000 (11:29 +0200)]
Move the rest of the features to generated docs

4 years agolabelled break test
robojumper [Sat, 30 May 2020 00:06:58 +0000 (02:06 +0200)]
labelled break test

4 years agoDoc more features
Aleksey Kladov [Sun, 31 May 2020 08:14:36 +0000 (10:14 +0200)]
Doc more features

4 years agoDon't require module docs for Features and Assists
Aleksey Kladov [Sun, 31 May 2020 07:59:38 +0000 (09:59 +0200)]
Don't require module docs for Features and Assists

4 years agoSpecify actions
Aleksey Kladov [Sun, 31 May 2020 07:45:41 +0000 (09:45 +0200)]
Specify actions

4 years agoIgnore HTML
Aleksey Kladov [Sun, 31 May 2020 07:29:15 +0000 (09:29 +0200)]
Ignore HTML

4 years agoSimplify
Aleksey Kladov [Sun, 31 May 2020 07:28:53 +0000 (09:28 +0200)]
Simplify

4 years agoChange Runnable.bin -> Runnable.kind
veetaha [Sun, 31 May 2020 02:13:08 +0000 (05:13 +0300)]
Change Runnable.bin -> Runnable.kind

As per matklad, we now pass the responsibility for finding the binary to the frontend.
Also, added caching for finding the binary path to reduce
the amount of filesystem interactions.

4 years agoFix tests, apply code review proposals
veetaha [Sat, 23 May 2020 13:31:56 +0000 (16:31 +0300)]
Fix tests, apply code review proposals

4 years agoFix invoking cargo without consulting CARGO or standard installation paths
veetaha [Sat, 23 May 2020 01:58:22 +0000 (04:58 +0300)]
Fix invoking cargo without consulting CARGO or standard installation paths

4 years agoGenerate features docs from source
Aleksey Kladov [Sat, 30 May 2020 23:54:54 +0000 (01:54 +0200)]
Generate features docs from source

4 years agoGeneralize
Aleksey Kladov [Sat, 30 May 2020 22:33:37 +0000 (00:33 +0200)]
Generalize

4 years agoMerge #4662
bors[bot] [Sat, 30 May 2020 22:00:07 +0000 (22:00 +0000)]
Merge #4662

4662: minor r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
4 years agominor
Aleksey Kladov [Sat, 30 May 2020 21:57:16 +0000 (23:57 +0200)]
minor

4 years agoTest case for format string highlighting of closing curlybrace
Roland Ruckerbauer [Sat, 30 May 2020 16:35:11 +0000 (18:35 +0200)]
Test case for format string highlighting of closing curlybrace

4 years agoFix problem with format string tokenization
Roland Ruckerbauer [Sat, 30 May 2020 12:09:10 +0000 (14:09 +0200)]
Fix problem with format string tokenization

Fixed by just not handling closing curlybrace escaping.

4 years agoMerge #4654
bors[bot] [Sat, 30 May 2020 08:26:04 +0000 (08:26 +0000)]
Merge #4654

4654: Add semantic highlight to ? operator r=matklad a=ruabmbua

Made it an operator with controlFlow modifier.

To highlight in vscode as red:

```json
"editor.semanticTokenColorCustomizations": {
        "enabled": true,
        "rules": {
            "operator.controlFlow": "#ff0000",
        }
}
```

![Bildschirmfoto von 2020-05-29 21-32-06](https://user-images.githubusercontent.com/2522373/83297998-f3585a00-a1f3-11ea-9d14-4ef04b9b6b9a.png)

https://github.com/rust-analyzer/rust-analyzer/issues/4597

Co-authored-by: Roland Ruckerbauer <roland.rucky@gmail.com>
4 years agoMerge #4562
bors[bot] [Sat, 30 May 2020 08:01:00 +0000 (08:01 +0000)]
Merge #4562

4562: Assist: replace anonymous lifetime with a named one r=matklad a=jbalint

(fixes #4523)

Co-authored-by: Jess Balint <jbalint@gmail.com>