]>
git.lizzy.rs Git - rust.git/log
bors[bot] [Mon, 29 Mar 2021 20:18:51 +0000 (20:18 +0000)]
Merge #8246
8246: update vim ycm installation instruction r=Veykril a=PSeitz
Fixes https://github.com/rust-analyzer/rust-analyzer.github.io/pull/97
Co-authored-by: PSeitz <PSeitz@users.noreply.github.com>
PSeitz [Mon, 29 Mar 2021 20:09:04 +0000 (22:09 +0200)]
remove enumeration
PSeitz [Mon, 29 Mar 2021 19:31:29 +0000 (21:31 +0200)]
update vim ycm installation instruction
bors[bot] [Mon, 29 Mar 2021 19:22:11 +0000 (19:22 +0000)]
Merge #8244
8244: internal: track missing `.check_cancelled` r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 29 Mar 2021 18:08:07 +0000 (21:08 +0300)]
internal: track missing `.check_cancelled`
bors[bot] [Mon, 29 Mar 2021 18:18:40 +0000 (18:18 +0000)]
Merge #8243
8243: Remove code duplication in highlight injection r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Mon, 29 Mar 2021 18:11:28 +0000 (20:11 +0200)]
Remove code duplication in highlight injection
bors[bot] [Mon, 29 Mar 2021 17:54:57 +0000 (17:54 +0000)]
Merge #8241
8241: internal: cleanup hprof r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 29 Mar 2021 17:54:15 +0000 (20:54 +0300)]
internal: cleanup hprof
bors[bot] [Mon, 29 Mar 2021 13:40:55 +0000 (13:40 +0000)]
Merge #8231
8231: Fold consecutive consts and statics r=matklad a=MozarellaMan
PR to implement #8114
![const_fold](https://user-images.githubusercontent.com/
48062697 /
112835083 -
b584c600 -9090-11eb-968a-
a95f4e9c1f6c .gif)
Co-authored-by: Ayomide Bamidele <ayoeze@hotmail.com>
bors[bot] [Mon, 29 Mar 2021 13:30:57 +0000 (13:30 +0000)]
Merge #8237
8237: README: drop "experimental" r=jonas-schievink a=jonas-schievink
rust-analyzer is not very experimental anymore, so let's drop that.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Mon, 29 Mar 2021 13:29:11 +0000 (15:29 +0200)]
README: drop "experimental"
bors[bot] [Mon, 29 Mar 2021 12:12:36 +0000 (12:12 +0000)]
Merge #8235
8235: internal: make --log-file more discoverable r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 29 Mar 2021 12:11:31 +0000 (15:11 +0300)]
internal: make --log-file more discoverable
Ayomide Bamidele [Mon, 29 Mar 2021 11:56:02 +0000 (12:56 +0100)]
formatting fix
Ayomide Bamidele [Mon, 29 Mar 2021 11:20:26 +0000 (12:20 +0100)]
Folding range for statics
Ayomide Bamidele [Mon, 29 Mar 2021 11:17:19 +0000 (12:17 +0100)]
Folding range for consts
Ayomide Bamidele [Mon, 29 Mar 2021 10:49:14 +0000 (11:49 +0100)]
New FoldKinds - Consts, Statics
Ayomide Bamidele [Mon, 29 Mar 2021 10:43:03 +0000 (11:43 +0100)]
Test cases for folding consts and statics
bors[bot] [Mon, 29 Mar 2021 07:30:28 +0000 (07:30 +0000)]
Merge #8222
8222: Don't mark unlinked file diagnostic as unused r=lnicola a=jonas-schievink
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8215, at least on VS Code
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
bors[bot] [Sun, 28 Mar 2021 15:43:11 +0000 (15:43 +0000)]
Merge #8212
8212: Basic support macro 2.0 r=jonas-schievink a=edwin0cheng
Turn out it is quite straight forward :)
r @jonas-schievink
![m2](https://user-images.githubusercontent.com/
11014119 /
112712565 -
6eb99380 -8f0b-11eb-88de-
5d7f974dfe6d .png)
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Sun, 28 Mar 2021 02:41:18 +0000 (10:41 +0800)]
Remove unused test fixtures
Jonas Schievink [Sun, 28 Mar 2021 01:56:03 +0000 (03:56 +0200)]
Don't mark unlinked file diagnostic as unused
bors[bot] [Sat, 27 Mar 2021 22:43:34 +0000 (22:43 +0000)]
Merge #8221
8221: Prefer adding `mod` declaration to lib.rs over file.rs in UnlinkedFile fix r=Veykril a=Veykril
When there is a `lib.rs` and `main.rs` in one crate, one usually wants the `lib.rs` file to declare the modules.
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Sat, 27 Mar 2021 21:39:39 +0000 (22:39 +0100)]
Prefer add `mod` declaration to lib.rs over file.rs in UnlinkedFile fix
bors[bot] [Sat, 27 Mar 2021 21:13:08 +0000 (21:13 +0000)]
Merge #8220
8220: Reorder some ide_db imports r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Sat, 27 Mar 2021 20:51:00 +0000 (21:51 +0100)]
Cleanup ide_db imports
bors[bot] [Sat, 27 Mar 2021 10:40:25 +0000 (10:40 +0000)]
Merge #8214
8214: Mention the rustup version in the manual r=lnicola a=lnicola
Closes #7860
bors r+
changelog fix mention the `rustup` version in the installation instructions.
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Sat, 27 Mar 2021 10:39:16 +0000 (12:39 +0200)]
Mention the rustup version in the manual
bors[bot] [Sat, 27 Mar 2021 10:00:37 +0000 (10:00 +0000)]
Merge #8213
8213: Added support for const generics in impl generation r=Veykril a=ivan770
Closes #8211
Co-authored-by: ivan770 <leshenko.ivan770@gmail.com>
ivan770 [Sat, 27 Mar 2021 09:37:39 +0000 (11:37 +0200)]
Added support for const generics in impl generation
Edwin Cheng [Sat, 27 Mar 2021 06:47:04 +0000 (14:47 +0800)]
Add support for doc on hover for macro 2.0
Edwin Cheng [Sat, 27 Mar 2021 05:48:15 +0000 (13:48 +0800)]
Unleash macro 2.0 in hightlight and more
Edwin Cheng [Sat, 27 Mar 2021 05:44:54 +0000 (13:44 +0800)]
Basic Support Macro 2.0
bors[bot] [Sat, 27 Mar 2021 02:57:02 +0000 (02:57 +0000)]
Merge #8201
8201: Fix recursive macro statements expansion r=edwin0cheng a=edwin0cheng
This PR attempts to properly handle macro statement expansion by implementing the following:
1. Merge macro expanded statements to parent scope statements.
2. Add a new hir `Expr::MacroStmts` for handle tail expression infer.
PS : The scope of macro expanded statements are so strange that it took more time than I thought to understand and implement it :(
Fixes #8171
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
bors[bot] [Fri, 26 Mar 2021 19:33:54 +0000 (19:33 +0000)]
Merge #8209
8209: Add TokenText r=lnicola a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 26 Mar 2021 18:33:45 +0000 (21:33 +0300)]
Add TokenText
bors[bot] [Fri, 26 Mar 2021 17:59:06 +0000 (17:59 +0000)]
Merge #8191
8191: syntax: return owned string instead of leaking string r=cynecx a=cynecx
Quick hack? to alleviate https://github.com/rust-analyzer/rust-analyzer/issues/8181#issuecomment-
806019126 . I haven't run any tests but this should affect performance since we are deallocating more.
r? @matklad
Co-authored-by: cynecx <me@cynecx.net>
cynecx [Fri, 26 Mar 2021 17:30:59 +0000 (18:30 +0100)]
syntax: return owned string instead of leaking string
bors[bot] [Fri, 26 Mar 2021 16:29:20 +0000 (16:29 +0000)]
Merge #8056
8056: completion relevance consider if types can be unified r=JoshMcguigan a=JoshMcguigan
This PR improves completion relevance scoring for generic types, in cases where the types could unify.
### Before
![pre-could-unify](https://user-images.githubusercontent.com/
22216761 /
111338556 -
46d94e80 -8634-11eb-9936-
2b20eb9e6756 .png)
### After
![post-could-unify](https://user-images.githubusercontent.com/
22216761 /
111338598 -
4e005c80 -8634-11eb-92e0-
69c2c1cda6fc .png)
changelog feature improve completions
Co-authored-by: Josh Mcguigan <joshmcg88@gmail.com>
Josh Mcguigan [Tue, 23 Mar 2021 04:18:34 +0000 (21:18 -0700)]
completion relevance distinguish between exact type match and could unify
Josh Mcguigan [Tue, 16 Mar 2021 15:45:46 +0000 (08:45 -0700)]
completion relevance consider if types can be unified
bors[bot] [Fri, 26 Mar 2021 15:00:58 +0000 (15:00 +0000)]
Merge #8206
8206: Ignore main functions not in root module r=Veykril a=ivan770
Closes #8195
Co-authored-by: ivan770 <leshenko.ivan770@gmail.com>
ivan770 [Fri, 26 Mar 2021 14:04:53 +0000 (16:04 +0200)]
Ignore main functions not in root module
Edwin Cheng [Thu, 25 Mar 2021 19:52:35 +0000 (03:52 +0800)]
Fix recursive macro statement expansion
bors[bot] [Thu, 25 Mar 2021 19:09:13 +0000 (19:09 +0000)]
Merge #8200
8200: Use arrayvec 0.6 r=kjeremy a=lnicola
Closes #8198
changelog skip
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 25 Mar 2021 19:06:48 +0000 (21:06 +0200)]
Use more std::array::IntoIter
Laurențiu Nicola [Thu, 25 Mar 2021 19:03:20 +0000 (21:03 +0200)]
Use arrayvec 0.6
bors[bot] [Thu, 25 Mar 2021 15:35:36 +0000 (15:35 +0000)]
Merge #8197
8197: Rust 1.51 r=lnicola a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Thu, 25 Mar 2021 15:34:13 +0000 (11:34 -0400)]
Rust 1.51
bors[bot] [Thu, 25 Mar 2021 10:33:05 +0000 (10:33 +0000)]
Merge #8193
8193: Fix manual description for rust_project.json r=Veykril a=tweksteen
Co-authored-by: Thiébaud Weksteen <tweek@google.com>
bors[bot] [Thu, 25 Mar 2021 10:18:44 +0000 (10:18 +0000)]
Merge #8194
8194: Make a full clone in `release.yaml` to bring in tags r=lnicola a=lnicola
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 25 Mar 2021 10:17:48 +0000 (12:17 +0200)]
Make a full clone in release.yaml
Thiébaud Weksteen [Thu, 25 Mar 2021 09:02:16 +0000 (10:02 +0100)]
Fix manual description for rust_project.json
bors[bot] [Wed, 24 Mar 2021 22:37:48 +0000 (22:37 +0000)]
Merge #7907
7907: Autoderef with visibility r=cynecx a=cynecx
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/7841.
I am not sure about the general approach here. Right now this simply tries to check whether the autoderef candidate is reachable from the current module. ~~However this doesn't exactly work with traits (see the `tests::macros::infer_derive_clone_in_core` test, which fails right now).~~ see comment below
Refs:
- `rustc_typeck` checking fields: https://github.com/rust-lang/rust/blob/
66ec64ccf31883cd2c28d045912a76179c0c6ed2 /compiler/rustc_typeck/src/check/expr.rs#L1610
r? @flodiebold
Co-authored-by: cynecx <me@cynecx.net>
bors[bot] [Wed, 24 Mar 2021 22:13:56 +0000 (22:13 +0000)]
Merge #8190
8190: Fix chalk_ir assertion r=flodiebold a=flodiebold
Fixes #8150.
I implemented a validator that catches this in the tests, but it'd need to get merged in Chalk first.
Co-authored-by: Florian Diebold <flodiebold@gmail.com>
Florian Diebold [Wed, 24 Mar 2021 22:07:54 +0000 (23:07 +0100)]
Fix chalk_ir assertion
Fixes #8150.
cynecx [Wed, 24 Mar 2021 22:09:22 +0000 (23:09 +0100)]
hir: don't use the self module as visible_from in iterate_method_candidates
cynecx [Wed, 24 Mar 2021 22:03:30 +0000 (23:03 +0100)]
hir_ty: don't call write_field_resolution when field candidate isn't visible
cynecx [Wed, 24 Mar 2021 21:59:59 +0000 (22:59 +0100)]
hir_def: move visibility queries from hir_ty to hir_def
bors[bot] [Wed, 24 Mar 2021 21:18:59 +0000 (21:18 +0000)]
Merge #8189
8189: Document unlinked-file diagnostic r=jonas-schievink a=jonas-schievink
fixes https://github.com/rust-analyzer/rust-analyzer/issues/8188
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 24 Mar 2021 21:18:17 +0000 (22:18 +0100)]
Document unlinked-file diagnostic
bors[bot] [Wed, 24 Mar 2021 18:00:18 +0000 (18:00 +0000)]
Merge #8187
8187: Sweep the new TraitEnvironmentQuery r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 24 Mar 2021 17:59:35 +0000 (18:59 +0100)]
Sweep the new TraitEnvironmentQuery
bors[bot] [Wed, 24 Mar 2021 11:31:51 +0000 (11:31 +0000)]
Merge #8184
8184: refine comment style of tests r=Veykril a=hi-rustin
Fix the comment style issues, it's in tests but maybe it's a little better to change it to this.
Co-authored-by: hi-rustin <rustin.liu@gmail.com>
hi-rustin [Wed, 24 Mar 2021 11:22:03 +0000 (19:22 +0800)]
refine comment style of tests
bors[bot] [Wed, 24 Mar 2021 10:55:25 +0000 (10:55 +0000)]
Merge #8168
8168: correct `convert to guard return` let_stmt r=Veykril a=hi-rustin
close https://github.com/rust-analyzer/rust-analyzer/issues/8074
Co-authored-by: hi-rustin <rustin.liu@gmail.com>
bors[bot] [Wed, 24 Mar 2021 10:17:12 +0000 (10:17 +0000)]
Merge #8183
8183: Fix missing command error with macros r=Veykril a=brandondong
**Reproduction:**
1. Define a struct through a macro (can be via `macro_rules`, proc macro, or `include!()`).
2. !!MISSING: command!! annotation appears. Clicking on it results in an error message. No matter where the macro is called/defined, the annotation is always at the start of the file.
![image](https://user-images.githubusercontent.com/
13722457 /
112268785 -
bce14500 -8c34-11eb-9a23-
bafd63ffd6ef .png)
**Cause:**
- For struct `A`, a `HasImpls` annotation is added just like for struct `B`. Unlike `B`, the file id for `A` is not the file we are adding annotations to but a macro file.
- The resolving step of the code lens does not succeed.
**Fix:**
- Check that the files match before computing offsets and adding `HasImpls`/`HasReferences` annotations.
Co-authored-by: Brandon <brandondong604@hotmail.com>
bors[bot] [Wed, 24 Mar 2021 08:53:48 +0000 (08:53 +0000)]
Merge #8177
8177: Limit the hints size by default r=Veykril a=SomeoneToIgnore
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8175
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/3138
Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
Brandon [Wed, 24 Mar 2021 07:47:55 +0000 (00:47 -0700)]
Clean up implementation
bors[bot] [Wed, 24 Mar 2021 07:11:28 +0000 (07:11 +0000)]
Merge #8182
8182: Trim down IPC json size r=edwin0cheng a=edwin0cheng
This PR try to trim down the json of proc macro IPC by ignore token id if it equals to `TokenId::unspecifed`.
Test by following commands:
```bash
$ git clone https://github.com/gluon-lang/lsp-types.git
$ export RA_LOG="proc_macro_api=debug"
$ rust-analyzer -q analysis-stats --load-output-dirs --with-proc-macro . 2> debug.log
$ cat debug.log | awk '/^\[DEBUG proc_macro_api::msg\] >/ {print substr($0,31)}' >expand.log
$ stat -c "%s" expand.log
```
Before:
37576726
After:
28551718
So it trimed down 75%.
bors r+
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Wed, 24 Mar 2021 07:01:37 +0000 (15:01 +0800)]
Trim down IPC json size
Brandon [Wed, 24 Mar 2021 07:00:38 +0000 (00:00 -0700)]
Fix MISSING: command error with macros
hi-rustin [Tue, 23 Mar 2021 15:23:01 +0000 (23:23 +0800)]
correct `convert to guard return` let_stmt
fix
fix
add check
bors[bot] [Tue, 23 Mar 2021 20:06:44 +0000 (20:06 +0000)]
Merge #8159
8159: Ignore proc-macro stdout to prevent IPC crash r=edwin0cheng a=edwin0cheng
fixes #7954
r? @flodiebold
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
bors[bot] [Tue, 23 Mar 2021 19:58:03 +0000 (19:58 +0000)]
Merge #8178
8178: Show item info when hovering intra doc links r=Veykril a=Veykril
![r4uIITP0IZ](https://user-images.githubusercontent.com/
3757771 /
112197618 -
91e2fb00 -8c0c-11eb-9edc-
a7923214d2b6 .gif)
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Tue, 23 Mar 2021 19:56:38 +0000 (20:56 +0100)]
Cleanup intra_doc_link parsing
Edwin Cheng [Tue, 23 Mar 2021 19:47:08 +0000 (03:47 +0800)]
Improve message usage in proc-macro
Reuse storage for the buffer send to child process of proc-macro.
Edwin Cheng [Tue, 23 Mar 2021 03:22:33 +0000 (11:22 +0800)]
Ignore proc-macro stdout to prevent IPC crash
Lukas Wirth [Tue, 23 Mar 2021 18:19:44 +0000 (19:19 +0100)]
Show item info when hovering intra doc links
bors[bot] [Tue, 23 Mar 2021 18:45:22 +0000 (18:45 +0000)]
Merge #8179
8179: cargo update r=kjeremy a=kjeremy
Removes dependency on socket2
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Tue, 23 Mar 2021 18:44:26 +0000 (14:44 -0400)]
cargo update
Removes dependency on socket2
Kirill Bulatov [Tue, 23 Mar 2021 17:43:55 +0000 (19:43 +0200)]
Bump the default hint length
bors[bot] [Tue, 23 Mar 2021 17:05:14 +0000 (17:05 +0000)]
Merge #8176
8176: Cleanup r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Kirill Bulatov [Tue, 23 Mar 2021 17:04:48 +0000 (19:04 +0200)]
Limit the hints size by default
Aleksey Kladov [Tue, 23 Mar 2021 16:59:33 +0000 (19:59 +0300)]
Cleanup
bors[bot] [Tue, 23 Mar 2021 16:54:35 +0000 (16:54 +0000)]
Merge #8173
8173: simplify r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Tue, 23 Mar 2021 16:39:43 +0000 (17:39 +0100)]
simplify
bors[bot] [Tue, 23 Mar 2021 16:44:28 +0000 (16:44 +0000)]
Merge #8174
8174: Simplify code r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 23 Mar 2021 16:41:15 +0000 (19:41 +0300)]
Simplify code
changelog: skip
bors[bot] [Tue, 23 Mar 2021 16:24:18 +0000 (16:24 +0000)]
Merge #8170
8170: Merge bang-macros and derives in name resolution r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Tue, 23 Mar 2021 16:23:10 +0000 (17:23 +0100)]
Merge bang-macros and derives in name resolution
bors[bot] [Tue, 23 Mar 2021 15:55:04 +0000 (15:55 +0000)]
Merge #8169
8169: Make more use of the HIR in rename::rename_to_self r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Tue, 23 Mar 2021 15:50:36 +0000 (16:50 +0100)]
Make more use of the HIR in rename::rename_to_self
bors[bot] [Tue, 23 Mar 2021 14:50:29 +0000 (14:50 +0000)]
Merge #8167
8167: Use styleguide conforming import for ast nodes r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 23 Mar 2021 14:44:17 +0000 (17:44 +0300)]
Use styleguide conforming import for ast nodes
bors[bot] [Tue, 23 Mar 2021 14:40:34 +0000 (14:40 +0000)]
Merge #8166
8166: Unify test style r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 23 Mar 2021 14:38:51 +0000 (17:38 +0300)]
Unify test style
changelog skip
bors[bot] [Tue, 23 Mar 2021 14:32:25 +0000 (14:32 +0000)]
Merge #8165
8165: Tweak assits API to fit mutable syntax trees r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Tue, 23 Mar 2021 14:31:19 +0000 (17:31 +0300)]
Tweak assits API to fit mutable syntax trees
changelog: skip