aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-223-7/+54
|\ | | | | | | feature/themes
| * Merge #2349bors[bot]2019-11-222-4/+23
| |\ | | | | | | | | | | | | | | | | | | | | | 2349: Ban println in lsp_server r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Ban println in lsp_serverAleksey Kladov2019-11-222-4/+23
| | |
| * | Merge #2350bors[bot]2019-11-221-3/+31
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 2350: Don't continue line comments r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Don't continue line commentsAleksey Kladov2019-11-221-3/+31
| |/
* | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-2228-510/+763
|\| | | | | | | feature/themes
| * Merge #2342bors[bot]2019-11-214-13/+93
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2342: Use proper MacroFileKind in `SourceAnalyzer` r=matklad a=edwin0cheng * Add `MacroFileKind::Statements` * Add `to_macro_file_kind` in `source_binding.rs` to set a proper `MacroFileKind` when expanding a macro. * Add a test for trying expanding `match_ast` which is not correct before this PR. * Fix some spacing issues in `insert_whitespaces` Co-authored-by: Edwin Cheng <[email protected]>
| | * Fix insert_whitespacesEdwin Cheng2019-11-211-11/+10
| | |
| | * Add test for match_astEdwin Cheng2019-11-211-0/+43
| | |
| | * Add to_macro_file_kindEdwin Cheng2019-11-211-2/+38
| | |
| | * Add MacroFileKind::StatementsEdwin Cheng2019-11-212-0/+2
| |/
| * Merge #2341bors[bot]2019-11-211-0/+68
| |\ | | | | | | | | | | | | | | | | | | | | | 2341: Fix mbe fail to parse TokenTree with endings whitespace r=matklad a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| | * Fixed mbe trival subtreeEdwin Cheng2019-11-211-0/+68
| | |
| * | Merge #2340bors[bot]2019-11-212-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2340: Fix test mark placement r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Fix test mark placementAleksey Kladov2019-11-212-2/+2
| | | |
| * | | Merge #2339bors[bot]2019-11-211-30/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2339: Update crates r=matklad a=kjeremy Removes duplicate crossbeam crates. Co-authored-by: Jeremy Kolb <[email protected]>
| | * | | Update cratesJeremy Kolb2019-11-211-30/+11
| | | |/ | | |/|
| * | | Merge #2338bors[bot]2019-11-2112-181/+139
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | 2338: Remove old hir::generics module r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * reformatAleksey Kladov2019-11-212-5/+4
| | |
| | * Remove old hir::generics moduleAleksey Kladov2019-11-2111-114/+94
| | |
| | * Reduce visibilityAleksey Kladov2019-11-211-41/+37
| | |
| | * ResimplifyAleksey Kladov2019-11-211-23/+6
| | |
| * | Merge #2337bors[bot]2019-11-2119-327/+493
| |\| | | | | | | | | | | | | | | | | | | | | | 2337: Move resolver to hir_def r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Restore a markAleksey Kladov2019-11-213-1/+20
| | |
| | * Move resolver to hir_defAleksey Kladov2019-11-2114-77/+63
| | |
| | * DecoupleAleksey Kladov2019-11-218-49/+53
| | |
| | * Split internal and user-visible ScopeDefAleksey Kladov2019-11-212-17/+40
| | |
| | * Use GenericParam in ScopeDefAleksey Kladov2019-11-212-4/+10
| | |
| | * Move ScopeDefAleksey Kladov2019-11-214-31/+31
| | |
| | * DecoupleAleksey Kladov2019-11-216-75/+105
| | |
| | * DecoupleAleksey Kladov2019-11-215-43/+59
| | |
| | * Move expr resolver to resolveAleksey Kladov2019-11-214-33/+35
| | |
| | * Decouple ResolverAleksey Kladov2019-11-2110-108/+188
| |/
* | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-2182-1067/+1451
|\| | | | | | | feature/themes
| * Merge #2336bors[bot]2019-11-201-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | 2336: Remove npm.cmd r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Remove npm.cmdAleksey Kladov2019-11-201-3/+3
| |/ | | | | | | I *think* this is more correct
| * Merge #2334bors[bot]2019-11-202-1/+29
| |\ | | | | | | | | | | | | | | | | | | | | | 2334: Add rust-analyzer-expand-macro function for Emacs r=flodiebold a=flodiebold Co-authored-by: Florian Diebold <[email protected]>
| | * Add rust-analyzer-expand-macro function for EmacsFlorian Diebold2019-11-202-1/+29
| |/
| * Merge #2332bors[bot]2019-11-2010-141/+127
| |\ | | | | | | | | | | | | | | | | | | | | | 2332: Add HasResolver trait r=matklad a=matklad bors merge Co-authored-by: Aleksey Kladov <[email protected]>
| | * Alternative quite tests aliasAleksey Kladov2019-11-201-0/+1
| | |
| | * SimplifyAleksey Kladov2019-11-202-41/+15
| | |
| | * Add HasResolver traitAleksey Kladov2019-11-209-134/+145
| | |
| * | Merge #2330bors[bot]2019-11-209-105/+81
| |\| | | | | | | | | | | | | | | | | | | | | | 2330: Remove hir/adt.rs r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Remove hir/adt.rsAleksey Kladov2019-11-206-66/+47
| | |
| | * Simplify generic paramsAleksey Kladov2019-11-204-39/+34
| | |
| * | Merge #2329bors[bot]2019-11-203-5/+58
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2329: fix 2190; add test for "replace if let with match" r=matklad a=fkohlgrueber Fixes #2190. Check that the expression doesn't contain newlines only for "replace if let with match". For "join lines", enclosing blocks for multiline expressions should be removed. Co-authored-by: Felix Kohlgrüber <[email protected]>
| | * | fix 2190; add test for "replace if let with match"Felix Kohlgrüber2019-11-203-5/+58
| |/ /
| * | Merge #2328bors[bot]2019-11-204-27/+37
| |\| | | | | | | | | | | | | | | | | | | | | | 2328: Move generic_params query to HIR r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Move generic_params query to HIRAleksey Kladov2019-11-204-27/+37
| |/
| * Merge #2327bors[bot]2019-11-2017-175/+287
| |\ | | | | | | | | | | | | | | | | | | | | | 2327: Move constants to new ID r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>