]>
git.lizzy.rs Git - rust.git/log
bors[bot] [Mon, 25 Jan 2021 11:18:58 +0000 (11:18 +0000)]
Merge #7409 #7421
7409: Add References CodeLens. r=matklad a=vsrs
Closes #5836
7421: Fix RA_LOG example in dev docs r=lnicola a=lnicola
bors r+
Co-authored-by: vsrs <vit@conrlab.com>
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Mon, 25 Jan 2021 11:14:31 +0000 (13:14 +0200)]
Fix RA_LOG example in dev docs
bors[bot] [Mon, 25 Jan 2021 11:04:23 +0000 (11:04 +0000)]
Merge #7419
7419: Unquote strings when expanding concat! r=matklad a=lnicola
Fixes #7417.
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Mon, 25 Jan 2021 10:53:44 +0000 (12:53 +0200)]
Unquote strings and handle boolean literals in concat!
bors[bot] [Mon, 25 Jan 2021 09:33:04 +0000 (09:33 +0000)]
Merge #7418
7418: :arrow_up: rowan r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Mon, 25 Jan 2021 09:32:35 +0000 (12:32 +0300)]
:arrow_up: rowan
bors[bot] [Mon, 25 Jan 2021 08:34:36 +0000 (08:34 +0000)]
Merge #7415
7415: Code: reduce progress notification spam r=lnicola a=lnicola
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Sun, 24 Jan 2021 14:13:33 +0000 (16:13 +0200)]
Code: reduce progress notification spam
bors[bot] [Sun, 24 Jan 2021 01:18:58 +0000 (01:18 +0000)]
Merge #7414
7414: Add validation for mutable const items r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Sun, 24 Jan 2021 01:17:41 +0000 (02:17 +0100)]
Add validation for mutable const items
bors[bot] [Sun, 24 Jan 2021 00:42:59 +0000 (00:42 +0000)]
Merge #7413
7413: Handle unions in symbol search r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
Lukas Wirth [Sun, 24 Jan 2021 00:32:52 +0000 (01:32 +0100)]
Support unions in symbol search
bors[bot] [Sat, 23 Jan 2021 16:30:26 +0000 (16:30 +0000)]
Merge #7411
7411: cargo update r=kjeremy a=kjeremy
Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
Jeremy Kolb [Sat, 23 Jan 2021 16:28:59 +0000 (11:28 -0500)]
cargo update
vsrs [Sat, 23 Jan 2021 13:56:20 +0000 (16:56 +0300)]
Add References code lens.
For Struct, Enum, Union and Trait symbols.
bors[bot] [Sat, 23 Jan 2021 08:42:45 +0000 (08:42 +0000)]
Merge #7062
7062: Add diagnostic for filter_map followed by next r=theotherphil a=theotherphil
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/1725
Co-authored-by: Phil Ellison <phil.j.ellison@gmail.com>
Phil Ellison [Sat, 23 Jan 2021 07:54:45 +0000 (07:54 +0000)]
Remove use of SourceFileEdit
Phil Ellison [Fri, 1 Jan 2021 21:40:11 +0000 (21:40 +0000)]
Update tests to register the required standard library types
Phil Ellison [Fri, 1 Jan 2021 21:17:54 +0000 (21:17 +0000)]
Fix test names
Phil Ellison [Fri, 1 Jan 2021 21:11:08 +0000 (21:11 +0000)]
Identify methods using functions ids rather than string names
Phil Ellison [Wed, 30 Dec 2020 16:15:00 +0000 (16:15 +0000)]
cargo fmt
Phil Ellison [Wed, 30 Dec 2020 16:14:35 +0000 (16:14 +0000)]
Address review comments
Phil Ellison [Wed, 30 Dec 2020 15:52:36 +0000 (15:52 +0000)]
cargo fmt
Phil Ellison [Wed, 30 Dec 2020 15:46:05 +0000 (15:46 +0000)]
Implement fix, add tests
Phil Ellison [Mon, 28 Dec 2020 13:41:15 +0000 (13:41 +0000)]
Add diagnostic for filter_map followed by next
bors[bot] [Sat, 23 Jan 2021 04:04:09 +0000 (04:04 +0000)]
Merge #7391
7391: Fix error when using "extern crate self as" r=kazatsuyu a=kazatsuyu
Fix #6957
Co-authored-by: kazatsuyu <shirayama.kazatsuyu@gmail.com>
bors[bot] [Fri, 22 Jan 2021 17:11:48 +0000 (17:11 +0000)]
Merge #7399
7399: Make `ModuleId`'s `krate` field private and audit uses r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Fri, 22 Jan 2021 17:09:55 +0000 (18:09 +0100)]
Make `ModuleId`'s `krate` field private
bors[bot] [Fri, 22 Jan 2021 16:51:45 +0000 (16:51 +0000)]
Merge #7398
7398: stave off zombies r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 22 Jan 2021 16:50:56 +0000 (19:50 +0300)]
stave off zombies
bors[bot] [Fri, 22 Jan 2021 16:16:22 +0000 (16:16 +0000)]
Merge #7396
7396: More annoying asserts r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 22 Jan 2021 16:05:28 +0000 (19:05 +0300)]
Normalize tests
Aleksey Kladov [Fri, 22 Jan 2021 15:59:22 +0000 (18:59 +0300)]
More useful fn detail in completion
Detail should be rendered as shtort one line, just dumping fn header
there is not useful, despite the fact that TS does this.
The fact that this is a function should be indicated by the icon, the
same goes for pub/const/async etc qualitfiers
name is already present in the lable (and arg list should be a part of
that, as in idea)
But the return type is the small genuinerlly useful bit of info we can show here
Aleksey Kladov [Fri, 22 Jan 2021 15:58:50 +0000 (18:58 +0300)]
Make assertion failures more annoying for maintainers
bors[bot] [Fri, 22 Jan 2021 15:45:50 +0000 (15:45 +0000)]
Merge #7310 #7395
7310: Add assist: add lifetime to type r=matklad a=bnjjj
close #7200
7395: Obtain `ModuleId`'s `DefMap` through a method r=jonas-schievink a=jonas-schievink
Once `ModuleId` can represent modules inside block expressions, this will be required in order to obtain the correct `DefMap`. Otherwise existing code might use a `LocalModuleId` from the wrong `DefMap` and cause a panic.
bors r+
Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Fri, 22 Jan 2021 15:31:40 +0000 (16:31 +0100)]
Obtain `ModuleId`'s `DefMap` through a method
bors[bot] [Fri, 22 Jan 2021 15:31:47 +0000 (15:31 +0000)]
Merge #7353
7353: Add LifetimeParam and ConstParam to CompletionItemKind r=matklad a=Veykril
Adds `LifetimeParam` and `ConstParam` to `CompletionItemKind` and maps them both to `TypeParam` in the protocol conversion as there are no equivalents, so nothing really changes there.
`ConstParam` could be mapped to `Const` I guess but I'm split on whether that would be better?
Additions were solely inspired by (the single) test output for const params.
Also sorts the variants of `CompletionItemKind` and its to_proto match.
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
kazatsuyu [Fri, 22 Jan 2021 15:11:37 +0000 (00:11 +0900)]
Add mark::check! and mark::hit!
bors[bot] [Fri, 22 Jan 2021 14:58:39 +0000 (14:58 +0000)]
Merge #7394
7394: Promote marks r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 22 Jan 2021 14:58:00 +0000 (17:58 +0300)]
Promote marks
bors[bot] [Fri, 22 Jan 2021 13:58:26 +0000 (13:58 +0000)]
Merge #7374
7374: Add step to run analysis-stats on std r=lnicola a=tweksteen
Run `analysis-stats` on `std` as part of the release workflow. Uses the `--with-deps` to also parse other crates defined in `stdlibs`. Remove the condition for exection, both analysis will be run for nightly and release builds.
Do not submit until #6956 has been fixed.
Bug: #6956
Co-authored-by: Thiébaud Weksteen <tweek@google.com>
kazatsuyu [Fri, 22 Jan 2021 13:52:04 +0000 (22:52 +0900)]
cargo fmt
kazatsuyu [Fri, 22 Jan 2021 13:28:45 +0000 (22:28 +0900)]
Fix error when using "extern crate self as"
bors[bot] [Fri, 22 Jan 2021 13:14:40 +0000 (13:14 +0000)]
Merge #7386
7386: Handle box with allocator r=flodiebold a=tweksteen
In 1.49.0, the definition of Box was modified to support an optional
Allocator[1]. Adapt the parsing of the `box` keyword to supply the
expected number of parameters to the constructor.
[1] https://github.com/rust-lang/rust/commit/
f288cd2e179f600fa00c2a407206a12f6c5a91e0
Fixes: #6956
Co-authored-by: Thiébaud Weksteen <tweek@google.com>
Thiébaud Weksteen [Fri, 22 Jan 2021 10:17:45 +0000 (11:17 +0100)]
Handle box with allocator
In 1.49.0, the definition of Box was modified to support an optional
Allocator[1]. Adapt the parsing of the `box` keyword to supply the
expected number of parameters to the constructor.
[1] https://github.com/rust-lang/rust/commit/
f288cd2e179f600fa00c2a407206a12f6c5a91e0
bors[bot] [Fri, 22 Jan 2021 12:42:55 +0000 (12:42 +0000)]
Merge #7390
7390: Style: use the right string r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
bors[bot] [Fri, 22 Jan 2021 12:29:42 +0000 (12:29 +0000)]
Merge #7348
7348: Fix broken link in intra-doc r=edwin0cheng a=sasurau4
Fix #5546
The intra-doc link doesn't work fine for trait associated method.
Co-authored-by: Daiki Ihara <sasurau4@gmail.com>
Aleksey Kladov [Fri, 22 Jan 2021 12:26:19 +0000 (15:26 +0300)]
Style: use the right string
bors[bot] [Fri, 22 Jan 2021 12:14:23 +0000 (12:14 +0000)]
Merge #7389
7389: Remove approximate goto def r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Fri, 22 Jan 2021 12:13:18 +0000 (15:13 +0300)]
Cleanup tests
Aleksey Kladov [Fri, 22 Jan 2021 12:11:29 +0000 (15:11 +0300)]
Remove index based fallback for goto def
We are so precise that the fallback creates more confusion, when you can
goto def on an unresolved reference.
bors[bot] [Fri, 22 Jan 2021 11:52:23 +0000 (11:52 +0000)]
Merge #7388
7388: Minor fix for #7387 r=edwin0cheng a=edwin0cheng
bors r+
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Fri, 22 Jan 2021 11:51:14 +0000 (19:51 +0800)]
Use AbsPath
bors[bot] [Fri, 22 Jan 2021 11:15:22 +0000 (11:15 +0000)]
Merge #7387
7387: Refactor build script specific data r=edwin0cheng a=edwin0cheng
It refactors for separating logic for build script specific data.
bors r+
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Fri, 22 Jan 2021 11:11:01 +0000 (19:11 +0800)]
Refactor build script data
Daiki Ihara [Tue, 19 Jan 2021 15:43:06 +0000 (00:43 +0900)]
Fix broken link in intra-doc
bors[bot] [Thu, 21 Jan 2021 20:12:58 +0000 (20:12 +0000)]
Merge #7384
7384: Remove unused field r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 20:12:26 +0000 (21:12 +0100)]
Remove unused field
bors[bot] [Thu, 21 Jan 2021 19:36:08 +0000 (19:36 +0000)]
Merge #7383
7383: Add test for path resolution bug r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 19:35:36 +0000 (20:35 +0100)]
Add test for path resolution bug
bors[bot] [Thu, 21 Jan 2021 19:06:43 +0000 (19:06 +0000)]
Merge #7382
7382: Cargo update r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Thu, 21 Jan 2021 19:00:42 +0000 (14:00 -0500)]
Cargo update
bors[bot] [Thu, 21 Jan 2021 18:04:58 +0000 (18:04 +0000)]
Merge #7381
7381: Revert "Make use of `block_def_map` in body lowering" r=jonas-schievink a=jonas-schievink
Reverts rust-analyzer/rust-analyzer#7380, since it broke stuff
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 18:04:31 +0000 (19:04 +0100)]
Revert "Make use of `block_def_map` in body lowering"
bors[bot] [Thu, 21 Jan 2021 17:46:44 +0000 (17:46 +0000)]
Merge #7378
7378: Include `countme` crate to count important data structures. r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
bors[bot] [Thu, 21 Jan 2021 17:09:05 +0000 (17:09 +0000)]
Merge #7380
7380: Make use of `block_def_map` in body lowering r=jonas-schievink a=jonas-schievink
Removes the `local_scope` argument from `Expander` in favor of tracking the `DefMap` in use during body lowering.
For now, we still collect inner items as usual, because other code still relies on `item_scope`.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 17:05:52 +0000 (18:05 +0100)]
Make use of `block_def_map` in body lowering
Removes the `local_scope` hack from `Expander` in favor of tracking the
`DefMap` in use during body lowering
Aleksey Kladov [Thu, 21 Jan 2021 16:04:50 +0000 (19:04 +0300)]
Include `countme` crate to count important data structures.
bors[bot] [Thu, 21 Jan 2021 16:20:17 +0000 (16:20 +0000)]
Merge #7377
7377: Remove unnecessary annotations from tests r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 16:19:46 +0000 (17:19 +0100)]
Remove unnecessary annotations from tests
bors[bot] [Thu, 21 Jan 2021 15:43:53 +0000 (15:43 +0000)]
Merge #7376
7376: Add test for nameres in nested blocks r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 15:42:56 +0000 (16:42 +0100)]
Add test for nameres in nested blocks
bors[bot] [Thu, 21 Jan 2021 15:28:40 +0000 (15:28 +0000)]
Merge #7375
7375: Add support for running name resolution in block expressions r=jonas-schievink a=jonas-schievink
This adds a `block_def_map` query that runs the name resolution algorithm on a block expression, and returns a `DefMap` that stores links to the parent `DefMap` (either the containing block or the crate-level `DefMap`). Blocks with no inner items return the parent's `DefMap` as-is, to avoid creating unnecessarily long `DefMap` chains.
Path resolution is updated to recurse into the parent `DefMap` after looking up a path in the original `DefMap`.
I've added a few new tests for this, but outside of those this isn't used yet.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 21 Jan 2021 15:23:50 +0000 (16:23 +0100)]
Add test that merges inner and outer names
Jonas Schievink [Thu, 21 Jan 2021 15:23:22 +0000 (16:23 +0100)]
Fix lowering with multiple block expressions
Thiébaud Weksteen [Thu, 21 Jan 2021 14:37:10 +0000 (15:37 +0100)]
Add step to run analysis-stats on std
bors[bot] [Thu, 21 Jan 2021 14:32:57 +0000 (14:32 +0000)]
Merge #7372
7372: Up lexer r=kjeremy a=kjeremy
No real changes here.
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Thu, 21 Jan 2021 14:31:06 +0000 (09:31 -0500)]
Up lexer
Jonas Schievink [Thu, 21 Jan 2021 14:24:15 +0000 (15:24 +0100)]
Fall back to parent DefMaps when resolving paths
Jonas Schievink [Thu, 21 Jan 2021 14:22:17 +0000 (15:22 +0100)]
Add name resolution query for block expressions
bors[bot] [Thu, 21 Jan 2021 14:15:14 +0000 (14:15 +0000)]
Merge #7371
7371: Change directory before running rustfmt to respect rustfmt.toml r=matklad a=lnicola
Fixes #6973
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 21 Jan 2021 13:58:17 +0000 (15:58 +0200)]
chdir to file before rustfmt
bors[bot] [Thu, 21 Jan 2021 13:38:28 +0000 (13:38 +0000)]
Merge #7370
7370: fix mega bug r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Thu, 21 Jan 2021 13:37:08 +0000 (16:37 +0300)]
Fix mega bug
https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Manual.20content.20is.20duplicated
bors[bot] [Thu, 21 Jan 2021 11:30:38 +0000 (11:30 +0000)]
Merge #7368
7368: Clarify enabled features and defined features in PackageData r=matklad a=edwin0cheng
Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
Edwin Cheng [Thu, 21 Jan 2021 11:12:19 +0000 (19:12 +0800)]
Added defined_features in PackageData
Benjamin Coenen [Thu, 21 Jan 2021 08:53:24 +0000 (09:53 +0100)]
Add assist: add lifetime to type #7200
Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
bors[bot] [Thu, 21 Jan 2021 08:33:25 +0000 (08:33 +0000)]
Merge #7367
7367: Bump chalk r=lnicola a=lnicola
Fixes #6945
Fixes #6812
bors r+
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
Laurențiu Nicola [Thu, 21 Jan 2021 08:29:19 +0000 (10:29 +0200)]
Bump chalk
bors[bot] [Wed, 20 Jan 2021 22:07:38 +0000 (22:07 +0000)]
Merge #7366
7366: Treat BlockExpr as a potential module origin r=jonas-schievink a=jonas-schievink
A block containing inner items acts like the root module of a crate, so it needs to be representable as a `ModuleSource` and `ModuleOrigin`.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 20 Jan 2021 19:05:48 +0000 (20:05 +0100)]
Treat BlockExpr as a potential module origin
Lukas Wirth [Wed, 20 Jan 2021 17:46:14 +0000 (18:46 +0100)]
Update completions test output
Lukas Wirth [Wed, 20 Jan 2021 17:38:12 +0000 (18:38 +0100)]
Partially unify SymbolKind and CompletionItemKind
bors[bot] [Wed, 20 Jan 2021 17:35:15 +0000 (17:35 +0000)]
Merge #7365
7365: chalk 0.49.0 r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
kjeremy [Wed, 20 Jan 2021 17:31:03 +0000 (12:31 -0500)]
chalk 0.49.0
bors[bot] [Wed, 20 Jan 2021 17:18:44 +0000 (17:18 +0000)]
Merge #7364
7364: DefMap: hide remaining crate-visible fields r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 20 Jan 2021 17:17:48 +0000 (18:17 +0100)]
DefMap: hide remaining crate-visible fields
bors[bot] [Wed, 20 Jan 2021 16:09:22 +0000 (16:09 +0000)]
Merge #7359
7359: ItemTree: store a mapping from blocks to inner items r=jonas-schievink a=jonas-schievink
To do name resolution within block expressions, we need to know which inner items are located inside each block expression. This adds such a mapping to `ItemTree`, replacing the previous one, which was seemingly unused other than to access all the inner items.
This also assigns `AstId`s to block expressions, which is needed to store the mapping in salsa.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
bors[bot] [Wed, 20 Jan 2021 14:55:53 +0000 (14:55 +0000)]
Merge #7361
7361: bump serde r=kjeremy a=kjeremy
Co-authored-by: kjeremy <kjeremy@gmail.com>
bors[bot] [Wed, 20 Jan 2021 14:44:49 +0000 (14:44 +0000)]
Merge #7360
7360: Make public DefMap fields private r=jonas-schievink a=jonas-schievink
This gives us more freedom to change the implementation for name resolution within block expressions.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>