]> git.lizzy.rs Git - rust.git/log
rust.git
2 years agoAuto merge of #12625 - yue4u:fix/non-exhaustive-variant, r=Veykril
bors [Thu, 23 Jun 2022 15:05:39 +0000 (15:05 +0000)]
Auto merge of #12625 - yue4u:fix/non-exhaustive-variant, r=Veykril

fix: completes non exhaustive variant within the defining crate

close #12624

2 years agofix: completes non exhaustive variant within the defining crate
yue4u [Thu, 23 Jun 2022 15:00:51 +0000 (00:00 +0900)]
fix: completes non exhaustive variant within the defining crate

2 years agoAuto merge of #12604 - Veykril:completions, r=Veykril
bors [Mon, 20 Jun 2022 19:56:05 +0000 (19:56 +0000)]
Auto merge of #12604 - Veykril:completions, r=Veykril

internal: Simplify some completions

2 years agointernal: Simplify some completions
Lukas Wirth [Mon, 20 Jun 2022 19:55:33 +0000 (21:55 +0200)]
internal: Simplify some completions

2 years agoAuto merge of #12599 - flodiebold:no-test-deps, r=flodiebold
bors [Mon, 20 Jun 2022 18:42:48 +0000 (18:42 +0000)]
Auto merge of #12599 - flodiebold:no-test-deps, r=flodiebold

fix: Only apply `cfg(test)` for local crates

Don't analyze dependencies with `test`; this should fix various cases where crates use `cfg(not(test))` and so we didn't find things.

"Local" here currently means anything that's not from the registry, so anything inside the workspace, but also path dependencies. So this isn't perfect, and users might still need to use `rust-analyzer.cargo.unsetTest` for these in some cases.

2 years agoFix test
Florian Diebold [Mon, 20 Jun 2022 18:34:08 +0000 (20:34 +0200)]
Fix test

2 years agoAuto merge of #12597 - Veykril:completions, r=Veykril
bors [Mon, 20 Jun 2022 18:28:08 +0000 (18:28 +0000)]
Auto merge of #12597 - Veykril:completions, r=Veykril

fix: Fix auto-ref completions inserting into wrong locations

Fixes https://github.com/rust-lang/rust-analyzer/issues/8058

2 years agoReimplement auto-ref completions for fields
Lukas Wirth [Mon, 20 Jun 2022 18:22:51 +0000 (20:22 +0200)]
Reimplement auto-ref completions for fields

2 years agoRefactor a bit
Florian Diebold [Mon, 20 Jun 2022 18:21:30 +0000 (20:21 +0200)]
Refactor a bit

2 years agoRemove pattern rendering hack
Lukas Wirth [Mon, 20 Jun 2022 18:16:40 +0000 (20:16 +0200)]
Remove pattern rendering hack

2 years agoOnly apply `cfg(test)` for local crates
Florian Diebold [Mon, 20 Jun 2022 18:10:25 +0000 (20:10 +0200)]
Only apply `cfg(test)` for local crates

Don't analyze dependencies with `test`; this should fix various cases
where crates use `cfg(not(test))` and so we didn't find things.

"Local" here currently means anything that's not from the registry, so
anything inside the workspace, but also path dependencies. So this isn't
perfect, and users might still need to use
`rust-analyzer.cargo.unsetTest` for these in some cases.

2 years agofix: Fix auto-ref completions inserting into wrong locations
Lukas Wirth [Mon, 20 Jun 2022 16:59:57 +0000 (18:59 +0200)]
fix: Fix auto-ref completions inserting into wrong locations

2 years agoAuto merge of #12596 - Veykril:completions, r=Veykril
bors [Mon, 20 Jun 2022 16:03:21 +0000 (16:03 +0000)]
Auto merge of #12596 - Veykril:completions, r=Veykril

fix: Don't trigger pattern completions when typing a wildcard pattern

Fixes https://github.com/rust-lang/rust-analyzer/issues/12592

2 years agofix: Don't trigger pattern completions when typing a wildcard pattern
Lukas Wirth [Mon, 20 Jun 2022 16:02:13 +0000 (18:02 +0200)]
fix: Don't trigger pattern completions when typing a wildcard pattern

2 years agoAuto merge of #12594 - Veykril:completions, r=Veykril
bors [Mon, 20 Jun 2022 15:42:31 +0000 (15:42 +0000)]
Auto merge of #12594 - Veykril:completions, r=Veykril

internal: Lift out IdentContext from CompletionContext

Makes things a bit messy overall, but with this I can start cleaning up the render functions properly now.
cc https://github.com/rust-lang/rust-analyzer/issues/12571

2 years agointernal: Lift out IdentContext from CompletionContext
Lukas Wirth [Mon, 20 Jun 2022 15:41:04 +0000 (17:41 +0200)]
internal: Lift out IdentContext from CompletionContext

2 years agointernal: Remove `previous_token` field from `CompletionContext`
Lukas Wirth [Mon, 20 Jun 2022 13:07:48 +0000 (15:07 +0200)]
internal: Remove `previous_token` field from `CompletionContext`

2 years agoAuto merge of #12588 - Veykril:completions, r=Veykril
bors [Mon, 20 Jun 2022 12:50:59 +0000 (12:50 +0000)]
Auto merge of #12588 - Veykril:completions, r=Veykril

internal: More completion reorganizing

2 years agoRemove some usages of `Completions::add_resolution`
Lukas Wirth [Mon, 20 Jun 2022 12:47:30 +0000 (14:47 +0200)]
Remove some usages of `Completions::add_resolution`

2 years agoEven more completion context filtering
Lukas Wirth [Mon, 20 Jun 2022 12:23:46 +0000 (14:23 +0200)]
Even more completion context filtering

2 years agoLift out PathKind variant fields into structs
Lukas Wirth [Mon, 20 Jun 2022 11:29:13 +0000 (13:29 +0200)]
Lift out PathKind variant fields into structs

2 years agoSplit remaining completion calls on the context kinds
Lukas Wirth [Mon, 20 Jun 2022 11:17:30 +0000 (13:17 +0200)]
Split remaining completion calls on the context kinds

2 years agoAuto merge of #12581 - lnicola:changelog-number, r=lnicola
bors [Sun, 19 Jun 2022 16:00:33 +0000 (16:00 +0000)]
Auto merge of #12581 - lnicola:changelog-number, r=lnicola

internal: Handle fractional release numbers in changelog naming

2 years agoAuto merge of #12584 - Veykril:attr-diag, r=Veykril
bors [Sat, 18 Jun 2022 22:38:04 +0000 (22:38 +0000)]
Auto merge of #12584 - Veykril:attr-diag, r=Veykril

fix: attribute macros not being properly diagnosed

Closes https://github.com/rust-lang/rust-analyzer/issues/12582

2 years agofix: attribute macros not being properly diagnosed
Lukas Wirth [Sat, 18 Jun 2022 22:37:37 +0000 (00:37 +0200)]
fix: attribute macros not being properly diagnosed

2 years agointernal: Handle fractional release numbers in changelog naming
Laurențiu Nicola [Sat, 18 Jun 2022 14:00:28 +0000 (17:00 +0300)]
internal: Handle fractional release numbers in changelog naming

2 years agoAuto merge of #12580 - Veykril:completion, r=Veykril
bors [Sat, 18 Jun 2022 09:21:13 +0000 (09:21 +0000)]
Auto merge of #12580 - Veykril:completion, r=Veykril

internal: Move more things out of `CompletionContext::function_def` into more specific parts

2 years agoConsider walking up macro expansions when searching for surrounding entities in compl...
Lukas Wirth [Sat, 18 Jun 2022 09:19:36 +0000 (11:19 +0200)]
Consider walking up macro expansions when searching for surrounding entities in completion analysis

2 years agoMove `CompletionContext::impl_def` into corresponding entities
Lukas Wirth [Sat, 18 Jun 2022 08:45:53 +0000 (10:45 +0200)]
Move `CompletionContext::impl_def` into corresponding entities

2 years agoMove `CompletionContext::incomplete_let` into `PathKind::Expr`
Lukas Wirth [Sat, 18 Jun 2022 08:18:56 +0000 (10:18 +0200)]
Move `CompletionContext::incomplete_let` into `PathKind::Expr`

2 years agoAuto merge of #12576 - harpsword:fold_range_non_block_match_arm, r=Veykril
bors [Sat, 18 Jun 2022 08:10:31 +0000 (08:10 +0000)]
Auto merge of #12576 - harpsword:fold_range_non_block_match_arm, r=Veykril

feat: add fold range for multi line match arm list

fix: #11893

2 years agofeat: add fold range for multi line match arm list
harpsword [Sat, 9 Apr 2022 05:44:41 +0000 (13:44 +0800)]
feat: add fold range for multi line match arm list

2 years agoMove `CompletionContext::function_def` into `PathKind::Expr`
Lukas Wirth [Sat, 18 Jun 2022 07:54:03 +0000 (09:54 +0200)]
Move `CompletionContext::function_def` into `PathKind::Expr`

2 years agoAuto merge of #12577 - Veykril:completion, r=Veykril
bors [Sat, 18 Jun 2022 06:59:12 +0000 (06:59 +0000)]
Auto merge of #12577 - Veykril:completion, r=Veykril

internal: NameRefKind classification is not optional

2 years agointernal: NameRefKind classification is not optional
Lukas Wirth [Sat, 18 Jun 2022 06:58:47 +0000 (08:58 +0200)]
internal: NameRefKind classification is not optional

2 years agoAuto merge of #12574 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 23:15:37 +0000 (23:15 +0000)]
Auto merge of #12574 - Veykril:completion, r=Veykril

minor: Simplify

2 years agominor: Simplify
Lukas Wirth [Fri, 17 Jun 2022 23:15:08 +0000 (01:15 +0200)]
minor: Simplify

2 years agoAuto merge of #12573 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 22:48:14 +0000 (22:48 +0000)]
Auto merge of #12573 - Veykril:completion, r=Veykril

internal: Split flyimport into its 3 applicable contexts

2 years agointernal: Split flyimport into its 3 applicable contexts
Lukas Wirth [Fri, 17 Jun 2022 22:47:28 +0000 (00:47 +0200)]
internal: Split flyimport into its 3 applicable contexts

2 years agoAuto merge of #12570 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 22:26:50 +0000 (22:26 +0000)]
Auto merge of #12570 - Veykril:completion, r=Veykril

Only run completion functions if their corresponding context is active

2 years agoOnly run completion functions if their corresponding context is active
Lukas Wirth [Fri, 17 Jun 2022 21:36:39 +0000 (23:36 +0200)]
Only run completion functions if their corresponding context is active

2 years agoRemove superfluous early returns
Lukas Wirth [Fri, 17 Jun 2022 15:49:25 +0000 (17:49 +0200)]
Remove superfluous early returns

2 years agoAuto merge of #12565 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 15:32:32 +0000 (15:32 +0000)]
Auto merge of #12565 - Veykril:completion, r=Veykril

internal: More completion refactors

2 years agoInline PathQualifierCtx
Lukas Wirth [Fri, 17 Jun 2022 15:27:12 +0000 (17:27 +0200)]
Inline PathQualifierCtx

2 years agointernal: Collapse lift is_infer_qualifier into `Qualified` variant
Lukas Wirth [Fri, 17 Jun 2022 15:15:29 +0000 (17:15 +0200)]
internal: Collapse lift is_infer_qualifier into `Qualified` variant

2 years agoMove existing_derives into PathKind::Derive
Lukas Wirth [Fri, 17 Jun 2022 14:56:21 +0000 (16:56 +0200)]
Move existing_derives into PathKind::Derive

2 years agoAuto merge of #12564 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 14:38:44 +0000 (14:38 +0000)]
Auto merge of #12564 - Veykril:completion, r=Veykril

internal: Collapse completion ctx path `qualifier` and `is_absolute_path` into enum

2 years agointernal: Collapse completion ctx path qualifier and is_absolute_path into enum
Lukas Wirth [Fri, 17 Jun 2022 14:36:22 +0000 (16:36 +0200)]
internal: Collapse completion ctx path qualifier and is_absolute_path into enum

2 years agoAuto merge of #12563 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 14:28:52 +0000 (14:28 +0000)]
Auto merge of #12563 - Veykril:completion, r=Veykril

internal: Simplify

2 years agoSimplify
Lukas Wirth [Fri, 17 Jun 2022 14:22:51 +0000 (16:22 +0200)]
Simplify

2 years agoAuto merge of #12562 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 13:19:45 +0000 (13:19 +0000)]
Auto merge of #12562 - Veykril:completion, r=Veykril

Split completion context module into definitions and analysis parts

2 years agoSplit out tests
Lukas Wirth [Fri, 17 Jun 2022 13:19:09 +0000 (15:19 +0200)]
Split out tests

2 years agoSplit completion context module into definitions and analysis parts
Lukas Wirth [Fri, 17 Jun 2022 13:16:20 +0000 (15:16 +0200)]
Split completion context module into definitions and analysis parts

2 years agoAuto merge of #12560 - Veykril:completion, r=Veykril
bors [Fri, 17 Jun 2022 13:10:05 +0000 (13:10 +0000)]
Auto merge of #12560 - Veykril:completion, r=Veykril

internal: More completions refactoring

This gets rid of the remaining `ImmediateLocation` bits

2 years agoRemove ImmediateLocation in favor of PathKind::Type
Lukas Wirth [Fri, 17 Jun 2022 12:18:03 +0000 (14:18 +0200)]
Remove ImmediateLocation in favor of PathKind::Type

2 years agoMove more ImmediateLocation::TypeAnnotation into PathKind::Type
Lukas Wirth [Fri, 17 Jun 2022 09:31:36 +0000 (11:31 +0200)]
Move more ImmediateLocation::TypeAnnotation into PathKind::Type

2 years agoIntroduce NameRefKind for completions
Lukas Wirth [Fri, 17 Jun 2022 08:45:19 +0000 (10:45 +0200)]
Introduce NameRefKind for completions

2 years agoAuto merge of #12554 - XFFXFF:fix_11959, r=Veykril
bors [Thu, 16 Jun 2022 12:48:33 +0000 (12:48 +0000)]
Auto merge of #12554 - XFFXFF:fix_11959, r=Veykril

fix: local items should not be completed in parent signature

fixes #11959

> We get a Bar completion for the following snippet which is wrong as the item is not visible in that position.
> ``` rust
> fn foo() -> $0 {
>    struct Bar;
> }
> ```

I investigated the problem and found that the scope of the cursor offset, also `CompletionContext.scope` is the body of the function

2 years agothe offset used for the completion cursor should always be relative to the original...
XFFXFF [Thu, 16 Jun 2022 08:43:08 +0000 (16:43 +0800)]
the offset used for the completion cursor should always be relative to the original file and not to the marco file

2 years agoAuto merge of #12517 - xuhongxu96:master, r=Veykril
bors [Thu, 16 Jun 2022 09:14:09 +0000 (09:14 +0000)]
Auto merge of #12517 - xuhongxu96:master, r=Veykril

fix methods in pub trait generated by macro cannot be completed

Fix #12483

Check if the container is trait and inherit the visibility to associate items during collection.

2 years agothe scope of the return type is not the body of the function
XFFXFF [Thu, 16 Jun 2022 08:12:46 +0000 (16:12 +0800)]
the scope of the return type is not the body of the function

2 years agodisable private editable in TEST_CONFIG by default
Hongxu Xu [Thu, 16 Jun 2022 00:52:57 +0000 (08:52 +0800)]
disable private editable in TEST_CONFIG by default
adjust test_visibility_filter test case

2 years agoAuto merge of #12545 - jeremyBanks:shebangs, r=Veykril
bors [Wed, 15 Jun 2022 20:01:37 +0000 (20:01 +0000)]
Auto merge of #12545 - jeremyBanks:shebangs, r=Veykril

fix: inserted imports must come after a shebang if present

The current `insert_use` logic adds the first `use` item near the beginning of the file, only skipping past comments and whitespace. However, it does not skip leading [shebang lines](https://en.wikipedia.org/wiki/Shebang_\(Unix\)). This can produce a syntax error, as shebangs are only accepted (ignored) on the first line of the file.

### Before Insertion (valid syntax)

```rust
#!/usr/bin/env rust

fn main() {}
```

### After Insertion (invalid syntax)

```rust
use foo::bar::Baz;

#!/usr/bin/env rust

fn main() {}
```

Rust analyzer's grammar is already shebang-aware, so this PR just adds that to the array of SyntaxKinds that are skipped past when looking for an insertion location, and adds a corresponding test case.

2 years agofix: inserted imports must come after a shebang if present
Jeremy Banks [Wed, 15 Jun 2022 19:42:16 +0000 (19:42 +0000)]
fix: inserted imports must come after a shebang if present

2 years agoadd failing test: inserts_after_shebang
Jeremy Banks [Wed, 15 Jun 2022 16:25:47 +0000 (16:25 +0000)]
add failing test: inserts_after_shebang

2 years agoAuto merge of #12544 - Veykril:proc-error, r=Veykril
bors [Wed, 15 Jun 2022 16:21:21 +0000 (16:21 +0000)]
Auto merge of #12544 - Veykril:proc-error, r=Veykril

Show proc-macro loading errors in unresolved-proc-macro diagnostics

This should help out people to potentially figure out the problem without having to check the logs

2 years agoUpdate test outputs
Lukas Wirth [Wed, 15 Jun 2022 16:07:37 +0000 (18:07 +0200)]
Update test outputs

2 years agoUse the correct crates proc-macro loading error message
Lukas Wirth [Wed, 15 Jun 2022 16:04:39 +0000 (18:04 +0200)]
Use the correct crates proc-macro loading error message

2 years agoDiagnose unresolved attribute proc-macros
Lukas Wirth [Wed, 15 Jun 2022 15:34:13 +0000 (17:34 +0200)]
Diagnose unresolved attribute proc-macros

2 years agoShow proc-macro loading errors in unresolved-proc-macro diagnostics
Lukas Wirth [Wed, 15 Jun 2022 15:33:55 +0000 (17:33 +0200)]
Show proc-macro loading errors in unresolved-proc-macro diagnostics

2 years agoAuto merge of #12541 - Veykril:vs-reload, r=Veykril
bors [Wed, 15 Jun 2022 12:29:34 +0000 (12:29 +0000)]
Auto merge of #12541 - Veykril:vs-reload, r=Veykril

fix: Clear proc-macro changed flag when reloading workspace

2 years agofix: Clear proc-macro changed flag when reloading workspace
Lukas Wirth [Wed, 15 Jun 2022 12:29:13 +0000 (14:29 +0200)]
fix: Clear proc-macro changed flag when reloading workspace

2 years agoAuto merge of #12537 - kevinushey:bugfix/items-typo, r=Veykril
bors [Wed, 15 Jun 2022 07:37:18 +0000 (07:37 +0000)]
Auto merge of #12537 - kevinushey:bugfix/items-typo, r=Veykril

fix typo in package.json

Fixes a small typo in `package.json`.

2 years agorevert hir-def lib.rs
Hongxu Xu [Tue, 14 Jun 2022 23:48:34 +0000 (07:48 +0800)]
revert hir-def lib.rs

2 years agocheck if the container is trait and inherit the visibility
Hongxu Xu [Tue, 14 Jun 2022 23:47:06 +0000 (07:47 +0800)]
check if the container is trait and inherit the visibility

2 years agofix typo in package.json
Kevin Ushey [Tue, 14 Jun 2022 21:44:23 +0000 (14:44 -0700)]
fix typo in package.json

2 years agoremove inherit_visibility test case in item_tree
Hongxu Xu [Tue, 14 Jun 2022 15:24:48 +0000 (23:24 +0800)]
remove inherit_visibility test case in item_tree

2 years agoimplement inherited_visibility in collector
Hongxu Xu [Tue, 14 Jun 2022 15:23:15 +0000 (23:23 +0800)]
implement inherited_visibility in collector

2 years agoremove inherited_visibility in lower.rs
Hongxu Xu [Tue, 14 Jun 2022 13:44:07 +0000 (21:44 +0800)]
remove inherited_visibility in lower.rs

2 years agoadd test cases to complete fn generated by macro in pub trait
Hongxu Xu [Tue, 14 Jun 2022 13:41:09 +0000 (21:41 +0800)]
add test cases to complete fn generated by macro in pub trait

2 years agoAuto merge of #12529 - Veykril:vs-reload, r=Veykril
bors [Tue, 14 Jun 2022 11:43:31 +0000 (11:43 +0000)]
Auto merge of #12529 - Veykril:vs-reload, r=Veykril

fix: Ask the user to reload the vscode window when changing server settings

These requires a window reload, as they are set before the server is being started

2 years agofix: Ask the user to reload the vscode window when changing server settings
Lukas Wirth [Tue, 14 Jun 2022 09:11:08 +0000 (11:11 +0200)]
fix: Ask the user to reload the vscode window when changing server settings

2 years agoAuto merge of #12528 - Veykril:proc-diag, r=Veykril
bors [Tue, 14 Jun 2022 09:00:21 +0000 (09:00 +0000)]
Auto merge of #12528 - Veykril:proc-diag, r=Veykril

fix: Check for the correct proc-macro settings in missing proc-macro diagnostics

2 years agofix: Check for the correct proc-macro settings in missing proc-macro diagnostics
Lukas Wirth [Tue, 14 Jun 2022 08:40:57 +0000 (10:40 +0200)]
fix: Check for the correct proc-macro settings in missing proc-macro diagnostics

2 years agoAuto merge of #12519 - Veykril:hover-assoc, r=Veykril
bors [Mon, 13 Jun 2022 09:58:04 +0000 (09:58 +0000)]
Auto merge of #12519 - Veykril:hover-assoc, r=Veykril

feat: On assoc item name hover, render trait decl docs

2 years agofeat: On assoc item name hover, render trait decl docs
Lukas Wirth [Mon, 13 Jun 2022 09:57:33 +0000 (11:57 +0200)]
feat: On assoc item name hover, render trait decl docs

2 years agoAuto merge of #12515 - Veykril:rustc-proc-macros, r=Veykril
bors [Sun, 12 Jun 2022 17:35:55 +0000 (17:35 +0000)]
Auto merge of #12515 - Veykril:rustc-proc-macros, r=Veykril

fix: Pass the build data to rustc_private crates

With this all proc-macros should resolve in rustc now when setting up the build script running command properly.

2 years agofix: Pass the build data to rustc_private crates
Lukas Wirth [Sun, 12 Jun 2022 17:29:45 +0000 (19:29 +0200)]
fix: Pass the build data to rustc_private crates

2 years agoAuto merge of #12514 - Veykril:proc-mac-err, r=Veykril
bors [Sun, 12 Jun 2022 17:27:41 +0000 (17:27 +0000)]
Auto merge of #12514 - Veykril:proc-mac-err, r=Veykril

More precise proc-macro errors

2 years agoMore precise proc-macro errors
Lukas Wirth [Sun, 12 Jun 2022 16:44:46 +0000 (18:44 +0200)]
More precise proc-macro errors

2 years agoAuto merge of #12513 - Veykril:ty-utils, r=Veykril
bors [Sun, 12 Jun 2022 14:08:08 +0000 (14:08 +0000)]
Auto merge of #12513 - Veykril:ty-utils, r=Veykril

internal: Simplify `hir_ty::utils`

2 years agointernal: Simplify `hir_ty::utils`
Lukas Wirth [Sun, 12 Jun 2022 14:07:08 +0000 (16:07 +0200)]
internal: Simplify `hir_ty::utils`

2 years agoAuto merge of #12509 - Veykril:ty-utils, r=Veykril
bors [Sun, 12 Jun 2022 12:40:57 +0000 (12:40 +0000)]
Auto merge of #12509 - Veykril:ty-utils, r=Veykril

internal: Remove `Generics::type_iter` in favor of `Generics::iter`

2 years agointernal: Remove `Generics::type_iter` in favor of `Generics::iter`
Lukas Wirth [Sun, 12 Jun 2022 12:40:37 +0000 (14:40 +0200)]
internal: Remove `Generics::type_iter` in favor of `Generics::iter`

2 years agoAuto merge of #12455 - bitgaoshu:fix_12441, r=flodiebold
bors [Sun, 12 Jun 2022 09:01:00 +0000 (09:01 +0000)]
Auto merge of #12455 - bitgaoshu:fix_12441, r=flodiebold

fix: #12441 False-positive type-mismatch error with generic future

I think the reason is same with #11815.
add ```Sized``` bound for ```AsyncBlockTypeImplTrait```.

2 years agoAuto merge of #12508 - Veykril:req-retry, r=Veykril
bors [Sun, 12 Jun 2022 00:56:52 +0000 (00:56 +0000)]
Auto merge of #12508 - Veykril:req-retry, r=Veykril

fix: Don't respond to cancelled requests when retrying them

Fixes https://github.com/rust-lang/rust-analyzer/issues/12482

2 years agofix: Don't respond to cancelled requests when retrying them
Lukas Wirth [Sun, 12 Jun 2022 00:56:19 +0000 (02:56 +0200)]
fix: Don't respond to cancelled requests when retrying them

2 years agoAuto merge of #12506 - cgburgess:master, r=Veykril
bors [Sat, 11 Jun 2022 16:57:38 +0000 (16:57 +0000)]
Auto merge of #12506 - cgburgess:master, r=Veykril

minor: Fix typo in style guide

Fix type `Ues` -> `Use` in `style.md`

2 years agofix typo in style.md
Chris Burgess [Sat, 11 Jun 2022 16:50:36 +0000 (12:50 -0400)]
fix typo in style.md

2 years agoAuto merge of #12504 - rust-lang:Veykril-patch-1, r=Veykril
bors [Sat, 11 Jun 2022 11:41:26 +0000 (11:41 +0000)]
Auto merge of #12504 - rust-lang:Veykril-patch-1, r=Veykril

fix: Fix config patching for callable snippets

Closes https://github.com/rust-lang/rust-analyzer/issues/12498