aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #3230bors[bot]2020-02-222-4/+23
|\ | | | | | | | | | | | | | | | | 3230: ra_mbe: convert_literal now works with malformed tokens r=edwin0cheng a=Veetaha Fixes: #3226 Co-authored-by: Veetaha <[email protected]> Co-authored-by: Veetaha <[email protected]>
| * ra_mbe: Remove explicit type annotationVeetaha2020-02-221-1/+1
| |
| * ra_mbe: added test for malformed token in macro invokationVeetaha2020-02-221-3/+21
| | | | | | | | | | There was a panic where lexer returned None on malformed tokens. But now we just ignore tokenization errors in mbe.
| * ra_mbe: convert_literal now works with malformed tokensVeetaha2020-02-221-2/+3
|/
* Merge #3262bors[bot]2020-02-225-6/+85
|\ | | | | | | | | | | | | | | | | | | | | | | | | 3262: Fix handling of const patterns r=matklad a=flodiebold E.g. in `match x { None => ... }`, `None` is a path pattern (resolving to the option variant), not a binding. To determine this, we need to try to resolve the name during lowering. This isn't too hard since we already need to resolve names for macro expansion anyway (though maybe a bit hacky). Fixes #1618. Co-authored-by: Florian Diebold <[email protected]>
| * Fix handling of const patternsFlorian Diebold2020-02-215-6/+85
| | | | | | | | | | | | | | | | | | E.g. in `match x { None => ... }`, `None` is a path pattern (resolving to the option variant), not a binding. To determine this, we need to try to resolve the name during lowering. This isn't too hard since we already need to resolve names for macro expansion anyway (though maybe a bit hacky). Fixes #1618.
* | Merge #3244bors[bot]2020-02-221-0/+106
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3244: Rename module references r=matklad a=adamrk Rename references to a module when the module is renamed. This fixes some missing renames in the existing implementation. For example, renaming the module `foo` to `foo2` in this case: ```rust mod foo { pub fn bar() {} } fn main() { foo::bar() } ``` previously would not change the call `foo::bar()` to `foo2::bar()`, but now it will. Co-authored-by: adamrk <[email protected]> Co-authored-by: Adam Bratschi-Kaye <[email protected]>
| * | remove unneeded `collect`adamrk2020-02-211-11/+7
| | |
| * | use Vec::extend instead of Vec::push in loopAdam Bratschi-Kaye2020-02-211-3/+1
| | | | | | | | | | | | Co-Authored-By: Laurențiu Nicola <[email protected]>
| * | rename module referencesadamrk2020-02-211-0/+112
|/ /
* | Merge #3264bors[bot]2020-02-212-25/+24
|\ \ | |/ |/| | | | | | | | | | | | | | | 3264: Tidy up documentation. r=flodiebold a=ablakey Thought I'd tidy up the docs while reading through them. Hope you don't mind! For the most part, I just made the formatting consistent through-out and added a few words here and there. Also updated the language server install graphic. Co-authored-by: Andrew Blakey <[email protected]>
| * update imageAndrew Blakey2020-02-211-2/+1
| |
| * update docsAndrew Blakey2020-02-212-24/+24
|/
* Merge #3259bors[bot]2020-02-212-1/+46
|\ | | | | | | | | | | | | | | 3259: Normalize associated types in types coming from Chalk r=matklad a=flodiebold Fixes #3232. Co-authored-by: Florian Diebold <[email protected]>
| * Normalize associated types in types coming from ChalkFlorian Diebold2020-02-212-1/+46
|/ | | | Fixes #3232.
* Merge #3247bors[bot]2020-02-216-1/+61
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 3247: Improve RA version display r=matklad a=edwin0cheng There are 2 problems of current implementation for displaying current version of RA binary: 1. If that binary is coming from built by source, the `REV` may not be updated somehow. (See discussion in [Zuilp](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/vscode.20version.20in.20console)) 2. We must go through the VSCode debugger console to see the output of `console.log`. This PR implemented a new VSCode command "Show RA Version" to display the version, which fixed the first problem. And added some `rerun-if` flags in `build.rs` to fix the second one. Co-authored-by: Edwin Cheng <[email protected]>
| * Use stdout directlyEdwin Cheng2020-02-211-2/+1
| |
| * Use ensureServerBinary insteadEdwin Cheng2020-02-211-5/+17
| |
| * Add trailing newlineEdwin Cheng2020-02-211-1/+2
| |
| * Remove unused placeholderEdwin Cheng2020-02-211-1/+1
| |
| * Add document for `Show RA Version`Edwin Cheng2020-02-211-0/+4
| |
| * Improve server version infoEdwin Cheng2020-02-215-1/+45
|/
* Merge #3258bors[bot]2020-02-214-6/+8
|\ | | | | | | | | | | | | | | | | | | | | 3258: enforce camel case r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * enforce camel caseAleksey Kladov2020-02-214-6/+8
|/
* Merge #3252bors[bot]2020-02-202-6/+10
|\ | | | | | | | | | | | | | | | | | | 3252: Improve integration with token color configuration r=matklad a=eaglgenes101 First, the extension now checks theme token color customizations as well as global token color customizations when determining what colors to highlight syntax with. Theme token color customizations take precedence over both global token color customizations and the theme token colors. Second, a few additional token color customization keys used by other themes are added. The original paths still take precedence, but now turning on rust analyzer syntax highlighting should now not unexpectedly homogenize token colors when custom themes are used. Co-authored-by: eaglgenes101 <[email protected]>
| * Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzereaglgenes1012020-02-201-1/+14
| |\
| * | Improved compatibility with themeseaglgenes1012020-02-202-6/+10
| | |
* | | Merge #3251bors[bot]2020-02-201-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3251: Better errorse r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Better errorseAleksey Kladov2020-02-201-2/+2
|/ /
* | Merge #3248bors[bot]2020-02-201-1/+14
|\ \ | |/ |/| | | | | | | | | | | 3248: Fix off by one in onEnter r=matklad a=lnicola Co-authored-by: Laurențiu Nicola <[email protected]>
| * Fix off by one in onEnterLaurențiu Nicola2020-02-201-1/+14
|/
* Merge pull request #3242 from matklad/deny-cAleksey Kladov2020-02-191-0/+1
|\ | | | | Deny c
| * Check that we use no C deps on CIAleksey Kladov2020-02-191-0/+1
|/ | | | | | | | | C deps are not a problem for a typical build, but cause issues in more esoteric scenarios, like cross-compiling. Let's check that we don't have them. Setting `CC` to some dummy value should do the trick, as custom build scripts typically respect this variable.
* Merge #3215bors[bot]2020-02-192-6/+34
|\ | | | | | | | | | | | | | | | | | | 3215: Exclude methods from non-parameter types introduced by generic constraints r=flodiebold a=lnicola Fixes #3184. r? @flodiebold Co-authored-by: Laurențiu Nicola <[email protected]>
| * Exclude methods from non-parameter types introduced by generic constraintsLaurențiu Nicola2020-02-192-6/+34
| |
* | Merge #3241bors[bot]2020-02-192-7/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3241: Fill missing fields of enum variants r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Fill missing fields of enum variantsAleksey Kladov2020-02-192-7/+40
|/ /
* | Merge pull request #3239 from matklad/opt-backtraceAleksey Kladov2020-02-192-1/+2
|\ \ | | | | | | Make backtrace optional
| * | Make backtrace optionalAleksey Kladov2020-02-192-1/+2
| | |
* | | Merge #3238bors[bot]2020-02-192-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 3238: Bump lsp-types r=kjeremy a=kjeremy bors r+ Co-authored-by: kjeremy <[email protected]>
| * | Bump lsp-typeskjeremy2020-02-192-2/+3
|/ /
* | Merge #3236bors[bot]2020-02-198-119/+91
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3236: Merge NameDefinition and NameKind r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Merge NameDefinition and NameKindAleksey Kladov2020-02-198-119/+91
| | |
* | | Merge #3235bors[bot]2020-02-193-53/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3235: Derive visibility as well r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Derive visibility as wellAleksey Kladov2020-02-193-53/+55
| | |
* | | Merge #3234bors[bot]2020-02-194-60/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3234: Don't store deriveable Module info in NameDefinition r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Don't store deriveable Module info in NameDefinitionAleksey Kladov2020-02-194-60/+84
| | |
* | | Merge #3233bors[bot]2020-02-191-0/+27
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3233: Extend selection handles commas in tuple pats r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Extend selection handles commas in tuple patsAleksey Kladov2020-02-191-0/+27
|/ /
* | Merge #3231bors[bot]2020-02-194-0/+67
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3231: Add `remove_mut` assist r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>