aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix ↵Seivan Heidari2019-12-234-16/+20
| | | | | | https://github.com/rust-analyzer/rust-analyzer/pull/2061#discussion_r348716036 Fix https://github.com/rust-analyzer/rust-analyzer/pull/2061/files/68a5ff050faf514e9d122212a66703ca8ce66ab7#r361019340
* Merge branch 'master' into feature/themesSeivan Heidari2019-12-23233-10763/+14882
|\
| * Merge #2636bors[bot]2019-12-238-306/+354
| |\ | | | | | | | | | | | | | | | | | | | | | 2636: Chalk update and refactoring r=flodiebold a=flodiebold This updates the Chalk integration to https://github.com/rust-lang/chalk/pull/311, which will presumably get merged soon, and refactors it some more, most notably introducing our own `TypeFamily` instead of reusing `ChalkIr`. It's still mostly the same as `ChalkIr` though, except for using Salsa `InternId`s directly. Co-authored-by: Florian Diebold <[email protected]>
| | * Filter out error predicates in type bounds as wellFlorian Diebold2019-12-222-2/+29
| | |
| | * Introduce our own Chalk TypeFamily, instead of using ChalkIrFlorian Diebold2019-12-224-87/+126
| | | | | | | | | | | | | | | | | | It's not very different, except we can directly use Salsa IDs instead of casting them. This means we need to refactor the handling of errors to get rid of UNKNOWN_TRAIT though.
| | * Refactor Chalk integration some moreFlorian Diebold2019-12-222-79/+83
| | |
| | * Update Chalk, clean up Chalk integration a bitFlorian Diebold2019-12-225-153/+131
| | |
| * | Merge #2652bors[bot]2019-12-232-4/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 2652: Bump lsp-types to 0.66.0 (fixes #2651) r=matklad a=udoprog Co-authored-by: John-John Tedro <[email protected]>
| | * Bump lsp-types to 0.66.0 (fixes #2651)John-John Tedro2019-12-232-4/+4
| |/
| * Merge #2648bors[bot]2019-12-227-65/+163
| |\ | | | | | | | | | | | | | | | | | | | | | 2648: Rudimentary name resolution for local items r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Rudimentary name resolution for local itemsAleksey Kladov2019-12-226-49/+145
| | |
| | * SimplifyAleksey Kladov2019-12-222-16/+17
| | |
| | * RefactorAleksey Kladov2019-12-222-10/+11
| |/
| * Merge #2646bors[bot]2019-12-223-53/+56
| |\ | | | | | | | | | | | | | | | | | | | | | 2646: Share impl Scope between modules and blocks r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Share impl Scope between modules and blocksAleksey Kladov2019-12-223-53/+56
| | |
| * | Merge #2645bors[bot]2019-12-227-140/+108
| |\| | | | | | | | | | | | | | | | | | | | | | 2645: Simplify r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * SimplifyAleksey Kladov2019-12-227-58/+41
| | |
| | * Remove unused parametersAleksey Kladov2019-12-222-23/+13
| | |
| | * Remove import fieldAleksey Kladov2019-12-222-19/+8
| | |
| | * Separate defs from importsAleksey Kladov2019-12-222-5/+8
| | |
| | * Refactor PerNs constructionAleksey Kladov2019-12-222-49/+52
| | |
| | * Minor renameAleksey Kladov2019-12-221-8/+8
| |/
| * Merge #2644bors[bot]2019-12-221-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | 2644: More compact profiling display r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * More compact profiling displayAleksey Kladov2019-12-221-4/+4
| | |
| * | Merge #2643bors[bot]2019-12-222-7/+9
| |\| | | | | | | | | | | | | | | | | | | | | | 2643: Don't fire no-op changes after files are saved to disk r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Don't fire no-op changes after files are saved to diskAleksey Kladov2019-12-222-7/+9
| |/
| * Merge #2642bors[bot]2019-12-224-6/+11
| |\ | | | | | | | | | | | | | | | | | | | | | 2642: Use name instead of ident in parser for macro 2.0 syntax r=matklad a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| | * Use name instead of ident for macro 2.0 sytnaxEdwin Cheng2019-12-224-6/+11
| | |
| * | Merge #2641bors[bot]2019-12-226-0/+71
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2641: Parse const generics r=matklad a=roblabla Adds very primitive support for parsing const generics (`const IDENT: TY`) so that rust-analyzer stops complaining about the syntax being invalid. Fixes #1574 Fixes #2281 Co-authored-by: roblabla <[email protected]>
| | * | Parse const genericsroblabla2019-12-226-0/+71
| | | | | | | | | | | | | | | | | | | | Fixes #1574 Fixes #2281
| * | | Merge #2640bors[bot]2019-12-219-9/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2640: Add some module docs r=kjeremy a=kjeremy Co-authored-by: Jeremy Kolb <[email protected]>
| | * | | Add some module docsJeremy Kolb2019-12-219-9/+14
| |/ / /
| * | | Merge #2638bors[bot]2019-12-213-2/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2638: More profiling r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | More profilingAleksey Kladov2019-12-213-2/+11
| |/ / /
| * | | Merge #2637bors[bot]2019-12-216-3/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2637: Optimize and profile r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Optimize and profileAleksey Kladov2019-12-216-3/+19
| | | | |
| * | | | Merge #2635bors[bot]2019-12-218-107/+43
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2635: Remove import source map r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Move LocalImportIdAleksey Kladov2019-12-214-28/+20
| | | | |
| | * | | Remove import source mapAleksey Kladov2019-12-215-66/+15
| | | | |
| | * | | Remove import from resolutionAleksey Kladov2019-12-212-17/+12
| |/ / /
| * | | Merge #2634bors[bot]2019-12-211-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2634: Update crates r=matklad a=kjeremy Co-authored-by: Jeremy Kolb <[email protected]>
| | * | | Update cratesJeremy Kolb2019-12-211-9/+9
| |/ / /
| * | | Merge #2633bors[bot]2019-12-218-45/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2633: Remove imports from hir r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Remove imports from hirAleksey Kladov2019-12-218-45/+22
| | | | |
| * | | | Merge #2632bors[bot]2019-12-2113-71/+166
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2632: Revert "Merge #2629" r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | | Revert "Merge #2629"Aleksey Kladov2019-12-2113-71/+166
| |/ / / | | | | | | | | | | | | | | | | This reverts commit cdc9d682b066b110e0a44e5f8f1c574b38c16ba9, reversing changes made to 90ef070db3dce0a7acb9cd11d0b0d72de13c9d79.
| * | | Merge #2630bors[bot]2019-12-213-43/+99
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2630: Add dummy implementations of env! and option_env! builtins r=matklad a=flodiebold They don't do anything except return the correct type. Also refactor the builtin macro tests a bit. Co-authored-by: Florian Diebold <[email protected]>
| | * | | Add dummy implementations of env! and option_env! builtinsFlorian Diebold2019-12-213-43/+99
| |/ / / | | | | | | | | | | | | | | | | | | | | They don't do anything except return the correct type. Also refactor the builtin macro tests a bit.
| * | | Merge #2629bors[bot]2019-12-2113-166/+71
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2629: Remove imports from hir r=matklad a=matklad We only used them to avoid self-confirming completions (`use self::foo`), but that can be handled more locally. bors r+ Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Privatize LocalImportIDAleksey Kladov2019-12-213-11/+8
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:03:50 +0000