]>
git.lizzy.rs Git - rust.git/log
Kirill Bulatov [Sun, 23 May 2021 08:28:06 +0000 (11:28 +0300)]
Download nightly extension when configured and run from stable extension version
bors[bot] [Sun, 23 May 2021 07:33:24 +0000 (07:33 +0000)]
Merge #8935
8935: docs(manual): Add rust-tools.nvim to nvim-lsp r=matklad a=simrat39
I'm not sure what to write there but this seems fine
https://github.com/simrat39/rust-tools.nvim/issues/16
Co-authored-by: sim <simrats169169@gmail.com>
sim [Sun, 23 May 2021 04:17:40 +0000 (21:17 -0700)]
docs(manual): Add rust-tools.nvim to nvim-lsp
bors[bot] [Sun, 23 May 2021 01:00:33 +0000 (01:00 +0000)]
Merge #8932
8932: internal: even prettier itemtrees r=jonas-schievink a=jonas-schievink
Extends the ItemTree pretty printer to handle all `Path`s, and to print generic parameters and where-clauses.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Sun, 23 May 2021 00:51:58 +0000 (02:51 +0200)]
Render where clauses and more generic params
Jonas Schievink [Sat, 22 May 2021 23:00:17 +0000 (01:00 +0200)]
Pretty-print generic parameters
Jonas Schievink [Sat, 22 May 2021 22:37:15 +0000 (00:37 +0200)]
ItemTree: pretty-print all paths
bors[bot] [Sat, 22 May 2021 18:35:02 +0000 (18:35 +0000)]
Merge #8926
8926: internal: Drop uncompressed release artifacts and those following the old naming convention r=matklad a=lnicola
Closes #6996
Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
bors[bot] [Sat, 22 May 2021 18:21:02 +0000 (18:21 +0000)]
Merge #8927
8927: internal: try enabling debug info for releases r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 22 May 2021 18:19:48 +0000 (21:19 +0300)]
internal: try enabling debug info for releases
We now compress releases, so let's check if debug info is light enough
to actually ship to users. Getting line numbers back would be helpful!
Laurențiu Nicola [Sat, 22 May 2021 17:23:03 +0000 (20:23 +0300)]
Drop uncompressed release artifacts and those following the old naming convention
bors[bot] [Sat, 22 May 2021 14:41:21 +0000 (14:41 +0000)]
Merge #8924
8924: Add last remaining module docstring r=flodiebold a=flodiebold
That was easier than expected.
Co-authored-by: Florian Diebold <flodiebold@gmail.com>
Florian Diebold [Sat, 22 May 2021 14:39:19 +0000 (16:39 +0200)]
Add last remaining module docstring
bors[bot] [Sat, 22 May 2021 14:20:42 +0000 (14:20 +0000)]
Merge #8923
8923: Add even more docs r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 22 May 2021 14:20:22 +0000 (17:20 +0300)]
Add even more docs
bors[bot] [Sat, 22 May 2021 13:54:13 +0000 (13:54 +0000)]
Merge #8922
8922: Add more docs r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 22 May 2021 13:53:47 +0000 (16:53 +0300)]
Add more docs
bors[bot] [Sat, 22 May 2021 13:30:32 +0000 (13:30 +0000)]
Merge #8868
8868: internal: replace AstTransformer with mutable syntax trees r=matklad a=matklad
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Aleksey Kladov [Sat, 22 May 2021 13:23:07 +0000 (16:23 +0300)]
use more precise name
bors[bot] [Sat, 22 May 2021 12:32:12 +0000 (12:32 +0000)]
Merge #8921
8921: Resolve any lifetime variables to 'static after inference r=flodiebold a=flodiebold
Chalk's unification can sometimes create lifetime variables, which we
currently don't really deal with, but at least we don't want to leak
them outside of inference.
Should fix #8919.
Co-authored-by: Florian Diebold <flodiebold@gmail.com>
Aleksey Kladov [Tue, 18 May 2021 11:42:41 +0000 (14:42 +0300)]
internal: replace AstTransformer with mutable syntax trees
Florian Diebold [Sat, 22 May 2021 12:25:58 +0000 (14:25 +0200)]
Resolve any lifetime variables to 'static after inference
Chalk's unification can sometimes create lifetime variables, which we
currently don't really deal with, but at least we don't want to leak
them outside of inference.
Should fix #8919.
bors[bot] [Sat, 22 May 2021 12:26:40 +0000 (12:26 +0000)]
Merge #8901
8901: fix: `fill_match_arms` hangs on a tuple of large enums r=matklad a=iDawer
+ Lazy computation of missing arms.
+ Convenience function to test lazy computation: `ide_assists::tests::check_assist_unresolved`.
Fixes #8835
Co-authored-by: Dawer <7803845+iDawer@users.noreply.github.com>
bors[bot] [Sat, 22 May 2021 00:31:17 +0000 (00:31 +0000)]
Merge #8918
8918: fix: fix hang caused by non-unique attribute IDs r=jonas-schievink a=jonas-schievink
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8905 (again)
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Sat, 22 May 2021 00:30:03 +0000 (02:30 +0200)]
Work around non-unique AttrIds
bors[bot] [Fri, 21 May 2021 23:18:19 +0000 (23:18 +0000)]
Merge #8916
8916: ItemTree pretty-printing r=jonas-schievink a=jonas-schievink
This adds a printer for `ItemTree` contents, and a few tests to ensure that `ItemTree` lowering works like we expect it to. It also adds a new "Debug ItemTree" command that can be used to see the `ItemTree` of the currently open file. The pretty-printed output is usually close enough to Rust syntax that we can even use Rust syntax highlighting.
This is similar to the old `ItemTree` tests we had, but produces significantly more readable output, so these should actually carry their weight.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Fri, 21 May 2021 22:11:54 +0000 (00:11 +0200)]
Use `.rs` file ending to get syntax highlighting
Jonas Schievink [Fri, 21 May 2021 22:03:36 +0000 (00:03 +0200)]
Update lsp-extensions.md
Jonas Schievink [Fri, 21 May 2021 21:59:52 +0000 (23:59 +0200)]
Add a "Debug ItemTree" LSP request
Jonas Schievink [Fri, 21 May 2021 21:45:27 +0000 (23:45 +0200)]
Add an ItemTree pretty-printer
Jonas Schievink [Fri, 21 May 2021 21:45:09 +0000 (23:45 +0200)]
impl Display for AttrInput/ImportAlias
bors[bot] [Fri, 21 May 2021 19:08:49 +0000 (19:08 +0000)]
Merge #8914
8914: internal: remove `StructDefKind` r=jonas-schievink a=jonas-schievink
The `Fields` enum already encodes this, so `StructDefKind` is redundant.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Fri, 21 May 2021 19:08:06 +0000 (21:08 +0200)]
Remove `StructDefKind`
bors[bot] [Fri, 21 May 2021 17:51:53 +0000 (17:51 +0000)]
Merge #8856
8856: Use Chalk for unification r=flodiebold a=flodiebold
- use Chalk's unification, get rid of our own `unify`
- rewrite coercion to not use unification internals and to be more analogous to rustc
- fix various coercion bugs
- rewrite handling of obligations, since the old hacky optimization where we noted when an inference variable changes wasn't possible anymore
- stop trying to deeply resolve types all the time during inference, instead only do it shallowly where necessary
Co-authored-by: Florian Diebold <flodiebold@gmail.com>
Florian Diebold [Fri, 21 May 2021 17:50:18 +0000 (19:50 +0200)]
Clean up visibilities
bors[bot] [Fri, 21 May 2021 16:29:31 +0000 (16:29 +0000)]
Merge #8910
8910: Don't lower extern block in the ItemTree r=jonas-schievink a=jonas-schievink
The ItemTree lowering code used to attach attributes on an `extern {}` block to all the children. This is wrong and causes problems with attribute resolution that manifested as a hang.
This PR treats extern blocks as first-class items in the ItemTree and lowers its contents in the `ModCollector` instead.
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8414#issuecomment-
845607923
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8905
Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8909
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Fri, 21 May 2021 16:27:25 +0000 (18:27 +0200)]
Don't lower extern block in the ItemTree
Florian Diebold [Fri, 21 May 2021 16:20:56 +0000 (18:20 +0200)]
Some remaining cleanups
Florian Diebold [Fri, 21 May 2021 16:07:30 +0000 (18:07 +0200)]
Fix test after rebase
Florian Diebold [Fri, 21 May 2021 15:48:15 +0000 (17:48 +0200)]
Record type mismatches for failed coercions in match etc.
Florian Diebold [Fri, 21 May 2021 15:41:20 +0000 (17:41 +0200)]
Refactor expectation handling
So as to not use `TyKind::Error` as "no expectation".
Florian Diebold [Sun, 16 May 2021 18:04:00 +0000 (20:04 +0200)]
Remove TypeVariableTable
Florian Diebold [Sun, 16 May 2021 16:27:17 +0000 (18:27 +0200)]
Deal with goals arising from unification
Florian Diebold [Sun, 16 May 2021 15:56:38 +0000 (17:56 +0200)]
Get rid of resolve_ty_as_possible
Instead use shallow resolving where necessary.
Florian Diebold [Sun, 16 May 2021 13:56:27 +0000 (15:56 +0200)]
Make resolve_ty_shallow return Ty
Florian Diebold [Sun, 16 May 2021 13:50:28 +0000 (15:50 +0200)]
Rework obligation handling
We can't do the easy hack that we did before anymore, where we kept
track of whether any inference variables changed since the last time we
rechecked obligations. Instead, we store the obligations in
canonicalized form; that way we can easily check the inference variables
to see whether they have changed since the goal was canonicalized.
Florian Diebold [Sat, 15 May 2021 21:09:18 +0000 (23:09 +0200)]
Fix another panic
Florian Diebold [Sat, 15 May 2021 20:26:55 +0000 (22:26 +0200)]
Improve debug printing without TLS
Florian Diebold [Sat, 15 May 2021 19:30:40 +0000 (21:30 +0200)]
Fix panic
Florian Diebold [Sat, 15 May 2021 18:28:07 +0000 (20:28 +0200)]
Fix HIR expecting errors to unify with anything
Florian Diebold [Sat, 15 May 2021 18:18:54 +0000 (20:18 +0200)]
Fix compilation of hir and ide crates
Florian Diebold [Sat, 15 May 2021 17:35:12 +0000 (19:35 +0200)]
Fix if/else coercion
Florian Diebold [Sat, 15 May 2021 17:28:58 +0000 (19:28 +0200)]
Make diverging type variables work again
Chalk doesn't know about the `diverging` flag, so we need to instead
propagate it before fully resolving the variables.
Florian Diebold [Sat, 15 May 2021 15:01:27 +0000 (17:01 +0200)]
Fix handling of diverging branches in match coercion
Fixes #7626.
Florian Diebold [Sat, 15 May 2021 14:00:24 +0000 (16:00 +0200)]
Fix coercion of two closures to a function pointer
Fixes #8604.
Florian Diebold [Thu, 13 May 2021 18:31:06 +0000 (20:31 +0200)]
Update tests with expected changes
Florian Diebold [Thu, 13 May 2021 17:44:29 +0000 (19:44 +0200)]
Make type resolver a proper folder, make it resolve consts as well
Florian Diebold [Sun, 9 May 2021 18:06:24 +0000 (20:06 +0200)]
Fix fallback to bound vars in `unify`
Florian Diebold [Sun, 9 May 2021 18:05:43 +0000 (20:05 +0200)]
Better Debug impl for InternedWrapper
Florian Diebold [Sun, 2 May 2021 14:32:42 +0000 (16:32 +0200)]
Temporary fix for unknown expectations
Florian Diebold [Sun, 2 May 2021 14:20:37 +0000 (16:20 +0200)]
Fix warnings & format
Florian Diebold [Sat, 1 May 2021 19:53:10 +0000 (21:53 +0200)]
Rewrite coercion using the new unification
Florian Diebold [Sun, 11 Apr 2021 09:20:45 +0000 (11:20 +0200)]
Remove our unification code, use Chalk's instead
Dawer [Fri, 21 May 2021 06:27:41 +0000 (11:27 +0500)]
Test `fill_match_arms` for lazy computation.
This also adds `ide_assists::tests::check_assist_unresolved` function.
bors[bot] [Thu, 20 May 2021 21:23:20 +0000 (21:23 +0000)]
Merge #8902
8902: fix: Fix code completion not inserting borrow text when client supports InsertAndReplace r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Tobias Wirth <lukastw97@gmail.com>
Lukas Tobias Wirth [Thu, 20 May 2021 21:22:21 +0000 (23:22 +0200)]
Fix code completion not inserting borrow text when client supports InsertAndReplace
Dawer [Thu, 20 May 2021 18:50:27 +0000 (23:50 +0500)]
fix: `fill_match_arms` hangs on a tuple of large enums
Dawer [Thu, 20 May 2021 12:58:18 +0000 (17:58 +0500)]
Compute missing arms lazily.
bors[bot] [Thu, 20 May 2021 18:41:26 +0000 (18:41 +0000)]
Merge #8900
8900: internal: support `#[register_attr]` and `#[register_tool]` r=jonas-schievink a=jonas-schievink
Relatively straightforward since these are crate-local.
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 20 May 2021 18:40:02 +0000 (20:40 +0200)]
Support `#[register_attr]` and `#[register_tool]`
Jonas Schievink [Thu, 20 May 2021 18:18:53 +0000 (20:18 +0200)]
Rename `ignore_attrs_on` to `skip_attrs`
bors[bot] [Thu, 20 May 2021 18:09:12 +0000 (18:09 +0000)]
Merge #8899
8899: minor: Simplify r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 20 May 2021 18:08:39 +0000 (20:08 +0200)]
Simplify
bors[bot] [Thu, 20 May 2021 17:57:06 +0000 (17:57 +0000)]
Merge #8898
8898: internal: resolve derive helpers r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Thu, 20 May 2021 17:56:04 +0000 (19:56 +0200)]
Refactor name resolution to resolve derive helpers
bors[bot] [Thu, 20 May 2021 16:05:54 +0000 (16:05 +0000)]
Merge #8897
8897: minor: Don't compare ast::Visibility by stringifying r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Tobias Wirth <lukastw97@gmail.com>
Lukas Tobias Wirth [Thu, 20 May 2021 15:27:51 +0000 (17:27 +0200)]
Don't compare ast::Visibility by stringifying
bors[bot] [Thu, 20 May 2021 13:32:45 +0000 (13:32 +0000)]
Merge #8893
8893: Update outdated auto-import documentation r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Tobias Wirth <lukastw97@gmail.com>
Lukas Tobias Wirth [Thu, 20 May 2021 13:29:21 +0000 (15:29 +0200)]
Update outdated auto-import documentation
Jonas Schievink [Thu, 20 May 2021 11:12:29 +0000 (13:12 +0200)]
Rename `unexpanded_macros` to `unresolved_macros`
bors[bot] [Thu, 20 May 2021 08:27:16 +0000 (08:27 +0000)]
Merge #8873
8873: Implement import-granularity guessing r=matklad a=Veykril
This renames our `MergeBehavior` to `ImportGranularity` as rustfmt has it as the purpose of them are basically the same. `ImportGranularity::Preserve` currently has no specific purpose for us as we don't have an organize imports assist yet, so it currently acts the same as `ImportGranularity::Item`.
We now try to guess the import style on a per file basis and fall back to the user granularity setting if the file has no specific style yet or where it is ambiguous. This can be turned off by setting `import.enforceGranularity` to `true`.
Closes https://github.com/rust-analyzer/rust-analyzer/issues/8870
Co-authored-by: Lukas Tobias Wirth <lukastw97@gmail.com>
Lukas Tobias Wirth [Thu, 20 May 2021 08:25:04 +0000 (10:25 +0200)]
Check for differing attributes in granularity guessing
bors[bot] [Wed, 19 May 2021 21:35:50 +0000 (21:35 +0000)]
Merge #8889
8889: internal: Track in-scope derive helpers during nameres r=jonas-schievink a=jonas-schievink
...without using them yet
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 19 May 2021 21:35:09 +0000 (23:35 +0200)]
Track in-scope derive helpers during nameres
bors[bot] [Wed, 19 May 2021 20:10:00 +0000 (20:10 +0000)]
Merge #8888
8888: fix: fix unresolved attribute fallback again r=jonas-schievink a=jonas-schievink
`ModItem`s are per-file, so we have to track the file if we store them in the crate-level `DefCollector`.
Fixes the remaining issue in https://github.com/rust-analyzer/rust-analyzer/pull/8882#issuecomment-
844379170
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 19 May 2021 20:08:34 +0000 (22:08 +0200)]
Fix unresolved attribute fallback again
bors[bot] [Wed, 19 May 2021 19:07:05 +0000 (19:07 +0000)]
Merge #8885 #8887
8885: internal: greatly simplify eager macro representation r=jonas-schievink a=jonas-schievink
- Share structures with lazy macros, make both use `MacroCallLoc`.
- Remove `intern_eager_expansion`, `EagerCallLoc`, `EagerMacroId`, and *many* matches on `MacroCallId`.
- Make a lot of FIXMEs obsolete since the code no longer distinguishes between eager and lazy macros.
- Add `EagerCallInfo`, which is `Some` for calls to eager macros and holds the argument or expansion result and the included file.
8887: fix: fix derive collection after unresolved attribute fallback r=jonas-schievink a=jonas-schievink
Fixes https://github.com/rust-analyzer/rust-analyzer/pull/8882#issuecomment-
844379170
bors r+
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 19 May 2021 19:05:58 +0000 (21:05 +0200)]
Fix derive collection after unresolved attribute fallback
bors[bot] [Wed, 19 May 2021 18:30:36 +0000 (18:30 +0000)]
Merge #8884
8884: fix: add_explicit_type produces invalid code on `@` patterns r=Veykril a=iDawer
In
```rust
let name @ () = ();
```
an explicit type should be inserted after the pattern, not just after the name.
`let` statement defined as `LetStmt = Attr* 'let' Pat (':' Type)? '=' initializer:Expr ';'`
Co-authored-by: Dawer <7803845+iDawer@users.noreply.github.com>
Dawer [Wed, 19 May 2021 18:12:09 +0000 (23:12 +0500)]
add_explicit_type respects `@` patterns
Jonas Schievink [Wed, 19 May 2021 18:23:26 +0000 (20:23 +0200)]
Clarify field name
Jonas Schievink [Wed, 19 May 2021 18:19:08 +0000 (20:19 +0200)]
Simplify eager macro representation
bors[bot] [Wed, 19 May 2021 17:46:38 +0000 (17:46 +0000)]
Merge #8875
8875: fix: false positive "Missing match arm" when an or-pattern has mismatched types r=flodiebold a=iDawer
![Screenshot_20210519_114510](https://user-images.githubusercontent.com/
7803845 /
118768935 -
19e12c00 -b86f-11eb-90c4-
1eed3f2bf57f .jpg)
`InferenceResult` now records pattern type mismatches.
Co-authored-by: Dawer <7803845+iDawer@users.noreply.github.com>
bors[bot] [Wed, 19 May 2021 17:06:49 +0000 (17:06 +0000)]
Merge #8882
8882: internal: resolve attributes in name resolution (minimal version) r=jonas-schievink a=jonas-schievink
Closes https://github.com/rust-analyzer/rust-analyzer/pull/7049
This should not have any observable effect, since we don't attempt to expand attribute macros yet, and I have implemented a fallback that treats items with unresolved attributes as if the attribute wasn't there.
Derive helpers are not yet resolved. `#![register_{attr,tool}]` are not yet supported.
Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
Jonas Schievink [Wed, 19 May 2021 17:05:03 +0000 (19:05 +0200)]
Rewrite `resolve_imports` to use an iterator
This allows reusing the original vector's allocation
Jonas Schievink [Wed, 19 May 2021 16:56:00 +0000 (18:56 +0200)]
Restructure nameres loop to be a bit clearer
Lukas Tobias Wirth [Tue, 18 May 2021 18:21:47 +0000 (20:21 +0200)]
Replace ImportGranularity::Guess with guessing boolean flag
Jonas Schievink [Wed, 19 May 2021 13:17:57 +0000 (15:17 +0200)]
internal: resolve attributes in name resolution
bors[bot] [Wed, 19 May 2021 12:31:44 +0000 (12:31 +0000)]
Merge #8877
8877: feat: allow clients to feature detect symbol filtering r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
bors[bot] [Wed, 19 May 2021 12:21:21 +0000 (12:21 +0000)]
Merge #8880
8880: fix: prepare_rename failing for modules r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Tobias Wirth <lukastw97@gmail.com>