bors[bot]
479d1f7eec
Merge #6818
...
6818: Add Lifetimes to the HIR r=matklad a=Veykril
This doesn't handle resolve yet as I don't know yet how that will be used. I'll get to that once I start moving the lifetime reference PR to the hir.
This also adds a new `hir` name type for lifetimes and labels, `hir::LifetimeName`.
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-12-12 14:35:38 +00:00
bors[bot]
64a1c9810d
Merge #6841
...
6841: Added "Remove this semicolon" test r=matklad a=ivan770
Closes https://github.com/rust-analyzer/rust-analyzer/pull/6769#discussion_r540150066
Co-authored-by: ivan770 <leshenko.ivan770@gmail.com>
2020-12-12 14:29:12 +00:00
ivan770
f7f4f366ac
Added remove this semicolon test
2020-12-12 13:50:11 +02:00
bors[bot]
70db57cc59
Merge #6839
...
6839: Infer labeled blocks r=flodiebold a=Veykril
The test should cover all the interesting cases I believe(main part of it is copied from the loop label break test above it).
The test is indented to stay consistent with the rest of the tests in the file, I can dedent all the tests in the file in a follow up PR if desired.
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-12-12 10:18:16 +00:00
Lukas Wirth
11f8664182
Add Lifetimes to the HIR
2020-12-12 00:56:52 +01:00
Lukas Wirth
378ec2841b
Infer labeled blocks
2020-12-12 00:06:48 +01:00
bors[bot]
4998807039
Merge #6813
...
6813: negative sign matching in mbe matching for literal r=edwin0cheng a=edwin0cheng
Fix #6292
r @jonas-schievink
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
2020-12-11 22:17:40 +00:00
Edwin Cheng
ae29fb0211
Add missing arg for eat_char
2020-12-12 06:14:11 +08:00
bors[bot]
c1ef623338
Merge #6838
...
6838: cargo update r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
2020-12-11 22:07:11 +00:00
kjeremy
8079f5b147
cargo update
2020-12-11 17:00:25 -05:00
bors[bot]
4227246948
Merge #6836
...
6836: Use Attrs::docs in NavigationTarget instead of DocCommentsOwner r=kjeremy a=Veykril
That should be the last place where the AST comment machinery is referred to.
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-12-11 20:32:11 +00:00
Lukas Wirth
8ed8e4f25a
Use Attrs::docs in NavigationTarget instead of DocCommentsOwner
2020-12-11 21:19:58 +01:00
bors[bot]
91bf15a2f5
Merge #6834
...
6834: Use Attrs::docs in runnables instead of DocCommentsOwner r=kjeremy a=Veykril
I figured that we should probably move as much of the doc usage to the HIR as possible hence this PR. If we should keep this AST-based feel free to close.
This change does have the nice(but not really useful as I doubt anyones gonna write doc tests like these) side effect that these two doc string snippets allow being run now.
![image](https://user-images.githubusercontent.com/3757771/101945607-bf241400-3bee-11eb-96ce-ccae80028b1f.png )
![image](https://user-images.githubusercontent.com/3757771/101946375-2e9a0380-3bef-11eb-9950-e35168fdd048.png )
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-12-11 19:57:08 +00:00
Lukas Wirth
ac19a71459
Use Attrs::docs in runnables instead of DocCommentsOwner
2020-12-11 20:11:03 +01:00
bors[bot]
1e4378b540
Merge #6832
...
6832: Add upstream commit to builtin_attr.rs r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 18:12:42 +00:00
Jonas Schievink
00c34b048e
Add upstream commit to builtin_attr.rs
2020-12-11 19:12:06 +01:00
bors[bot]
3674e494ca
Merge #6819
...
6819: Add builtin attributes for use in nameres r=jonas-schievink a=jonas-schievink
These are not yet used, but have to go through nameres later in order to support procedural macro attributes
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 18:03:09 +00:00
bors[bot]
3df4b8c1fa
Merge #6830
...
6830: Avoid panic when collecting memory metrics r=jonas-schievink a=jonas-schievink
This is getting hit during metrics collection.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 17:25:16 +00:00
Jonas Schievink
cb35d3a05a
metrics: go back to cmd!
2020-12-11 18:24:42 +01:00
Jonas Schievink
2fdde98b5c
Move print_memory_usage to cli.rs
2020-12-11 18:24:27 +01:00
Jonas Schievink
c007ac3830
Avoid panic when collecting memory metrics
2020-12-11 18:18:27 +01:00
bors[bot]
24731e107f
Merge #6829
...
6829: Fix typo leading to metrics loss r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 16:56:30 +00:00
Jonas Schievink
64752ef5e9
Fix typo leading to metrics loss
2020-12-11 17:55:52 +01:00
bors[bot]
d3700b80b1
Merge #6828
...
6828: Metrics debugging r=jonas-schievink a=jonas-schievink
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 16:31:13 +00:00
Jonas Schievink
7fc4ba000e
Capture memory usage metrics
2020-12-11 17:30:32 +01:00
bors[bot]
e68110c082
Merge #6827
...
6827: Revert "Fix memory usage metrics" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#6825
It broke metrics entirely. Will debug this later, unless someone else gets to it first.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 15:51:13 +00:00
Jonas Schievink
75543d8ca1
Revert "Fix memory usage metrics"
2020-12-11 16:50:17 +01:00
bors[bot]
df1f3907af
Merge #6824
...
6824: Don't highlight parent nodes of comments on hover r=kjeremy a=Veykril
Fixes #6815
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2020-12-11 15:02:57 +00:00
Lukas Wirth
37c5b82938
Don't highlight parent nodes of comments on hover
2020-12-11 16:00:52 +01:00
bors[bot]
57ea320ffc
Merge #6825
...
6825: Fix memory usage metrics r=jonas-schievink a=jonas-schievink
Let's see if this fixes https://github.com/rust-analyzer/rust-analyzer/issues/6808
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-11 14:48:27 +00:00
Jonas Schievink
777d8dca26
Fix memory usage metrics
2020-12-11 15:47:40 +01:00
bors[bot]
f304ce329f
Merge #6821
...
6821: Improve code structure r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-12-11 14:08:22 +00:00
Aleksey Kladov
4015ff0e0b
Improve code structure
...
Make sure that there's only one entry point, analyze, remove awkard
analyzer2 name
2020-12-11 17:06:21 +03:00
Jonas Schievink
253678ead2
Add builtin attributes for use in nameres
2020-12-11 14:04:33 +01:00
bors[bot]
15a644d606
Merge #6816
...
6816: Use natural trait ordering in derive completion r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-12-11 12:46:47 +00:00
Aleksey Kladov
e179ed6f53
Use natural trait ordering in derive completion
...
derive(Clone, Copy) reads better than derive(Copy, Clone).
However, we preserve the reverse ordering in the lookup text for
sorting purposes. That way, it's convenient to type just `Ord` to
derive everything.
2020-12-11 15:45:53 +03:00
Edwin Cheng
175229ab3d
negative sign matching in mbe matching for literal
2020-12-11 17:59:04 +08:00
bors[bot]
41321d9678
Merge #6807
...
6807: Replicate Cargo environment variables r=jonas-schievink a=jonas-schievink
These might be relied on by procedural macros, and can also be accessed via `env!`.
Required for fixing https://github.com/rust-analyzer/rust-analyzer/issues/6696 . We do not yet propagate these to any proc macros though.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-10 18:30:11 +00:00
Jonas Schievink
4d4b91117a
Use itertools
2020-12-10 19:29:11 +01:00
bors[bot]
814e31957e
Merge #6804
...
6804: Bump the macro token limit r=jonas-schievink a=jonas-schievink
Should fix https://github.com/rust-analyzer/rust-analyzer/issues/6504
Not entirely sure what the previous limit was based on, but it looks like it does get hit in practice.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
2020-12-10 18:14:17 +00:00
Jonas Schievink
41d73d1312
Replicate Cargo environment variables
2020-12-10 18:51:39 +01:00
bors[bot]
6095debda8
Merge #6806
...
6806: Improve docs for building from source r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
2020-12-10 17:32:21 +00:00
Laurențiu Nicola
3ecdb778c2
Improve docs for building from source
2020-12-10 19:31:46 +02:00
bors[bot]
0baff25d99
Merge #6805
...
6805: Fix accidently quadratic syntax rewriter r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2020-12-10 17:08:59 +00:00
Aleksey Kladov
3d5be5ba5b
Fix accidently quadratic syntax rewriter
...
Switching from SyntaxNode to GreenNode is a costly operation (b/c
dereferencing a synax ptr in `with_green` is linear), so we should
avoid that.
2020-12-10 20:07:37 +03:00
Jonas Schievink
829d9d36eb
Use decimal notation
2020-12-10 18:03:37 +01:00
Jonas Schievink
19508b474f
Double the macro token limit
2020-12-10 17:51:39 +01:00
Jonas Schievink
614e5a2272
Improve macro limit error and move to const
2020-12-10 17:50:56 +01:00
bors[bot]
44978acf51
Merge #6769
...
6769: Add native "remove this semicolon" diagnostics r=matklad a=ivan770
Closes #6739
![demo2](https://user-images.githubusercontent.com/14003886/101530533-b76c3180-399a-11eb-9d18-5c8457721655.gif )
Co-authored-by: ivan770 <leshenko.ivan770@gmail.com>
2020-12-10 16:18:49 +00:00
ivan770
bbb0bc7b04
Cast to ExprStmt, style fixes
2020-12-10 18:10:39 +02:00