aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #3868bors[bot]2020-04-063-2/+33
|\ | | | | | | | | | | | | | | | | | | | | | | 3868: Fix Chalk panic r=flodiebold a=flodiebold Fixes #3865. Basically I forgot to shift 'back' when we got `dyn Trait`s back from Chalk, so after going through Chalk a few times, the panic happened. And yes, I did run `analysis-stats` now ;) cc @edwin0cheng Co-authored-by: Florian Diebold <[email protected]>
| * Fix Chalk panicFlorian Diebold2020-04-063-2/+33
|/ | | | | Fixes #3865. Basically I forgot to shift 'back' when we got `dyn Trait`s back from Chalk, so after going through Chalk a few times, the panic happened.
* Merge pull request #3867 from matklad/deny-eprintlnAleksey Kladov2020-04-068-13/+39
|\ | | | | Check for eprintlns on CI
| * More general CI env varAleksey Kladov2020-04-061-1/+1
| |
| * Check for eprintln on CIAleksey Kladov2020-04-067-12/+38
| |
* | Merge #3842bors[bot]2020-04-0613-9/+2950
|\ \ | |/ |/| | | | | | | | | | | | | | | 3842: Add lib-proc-macro mod in ra_proc_macro_srv r=matklad a=edwin0cheng This PR add a module in ra_proc_macro_srv, which is just copy & paste from rustc lib_proc_macro and remove all unstable features in it. The main idea here is by doing that, we could build the `ra_proc_macro_srv` without nightly compiler and remain ABI compatibility. Co-authored-by: Edwin Cheng <[email protected]>
| * Add bridge::TokenStream to crate scopeEdwin Cheng2020-04-061-0/+1
| |
| * Add proc_macro mod (copy from lib_proc_macro)Edwin Cheng2020-04-0611-0/+2943
| |
| * Refactor depsEdwin Cheng2020-04-062-9/+6
|/
* Merge #3864bors[bot]2020-04-061-1/+1
|\ | | | | | | | | | | | | | | 3864: Use log::info in trait_solve_query instead of eprintln r=edwin0cheng a=edwin0cheng cc @flodiebold Co-authored-by: Edwin Cheng <[email protected]>
| * Use log info in trait_solve_queryEdwin Cheng2020-04-061-1/+1
|/
* Merge pull request #3853 from matklad/cfAleksey Kladov2020-04-065-12/+9
|\ | | | | Make control token modifier less ambiguous
| * Make control token modifier less ambiguousAleksey Kladov2020-04-065-12/+9
| | | | | | | | | | | | | | | | | | In textmate, keyword.control is used for all kinds of things; in fact, the default scope mapping for keyword is keyword.control! So let's add a less ambiguous controlFlow modifier See Microsoft/vscode#94367
* | Merge #3843bors[bot]2020-04-062-11/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 3843: Remove rustc_lexer dependency in favour of rustc-ap-rustc_lexer r=est31 a=est31 The latter is auto-published on a regular schedule (Right now weekly). See also https://github.com/alexcrichton/rustc-auto-publish Co-authored-by: est31 <[email protected]>
| * | Remove rustc_lexer dependency in favour of rustc-ap-rustc_lexerest312020-04-062-11/+11
| | | | | | | | | | | | The latter is auto-published on a regular schedule (Right now weekly).
* | | Merge #3829bors[bot]2020-04-061-12/+110
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3829: Adds to SSR match for semantically equivalent call and method call r=matklad a=mikhail-m1 #3186 maybe I've missed some corner cases, but it works in general Co-authored-by: Mikhail Modin <[email protected]>
| * | | Adds to SSR match for semantically equivalent call and method callMikhail Modin2020-04-021-12/+110
| | | |
* | | | Merge #3744bors[bot]2020-04-0612-158/+307
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 3744: Upgrade Chalk r=matklad a=flodiebold Co-authored-by: Florian Diebold <[email protected]> Co-authored-by: Florian Diebold <[email protected]>
| * | | Upgrade Chalk againFlorian Diebold2020-04-0512-115/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The big change here is counting binders, not variables (https://github.com/rust-lang/chalk/pull/360). We have to adapt to the same scheme for our `Ty::Bound`. It's mostly fine though, even makes some things more clear.
| * | | Upgrade ChalkFlorian Diebold2020-04-054-52/+118
| | | |
* | | | Merge pull request #3855 from edwin0cheng/add-back-deny-ccAleksey Kladov2020-04-061-5/+2
|\ \ \ \ | | | | | | | | | | Add back deny_c
| * | | | Add back deny_cEdwin Cheng2020-04-051-5/+2
| | | | |
* | | | | Merge #3859bors[bot]2020-04-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3859: Update serde_json r=kjeremy a=kjeremy Grabs fix for https://github.com/serde-rs/json/issues/647 Co-authored-by: kjeremy <[email protected]>
| * | | | | Update serde_jsonkjeremy2020-04-051-2/+2
|/ / / / /
* | | | | Merge #3858bors[bot]2020-04-055-20/+28
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3858: Hide unit function return types r=flodiebold a=lnicola r? @flodiebold This might be a bit heavy-handed (e.g. `|| -> ()` to `||`), what do you think? Co-authored-by: Laurențiu Nicola <[email protected]>
| * | | | Hide unit fn return typesLaurențiu Nicola2020-04-055-20/+28
|/ / / /
* | | | Merge #3857bors[bot]2020-04-052-1/+31
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3857: Fix inference of function pointer return types r=flodiebold a=lnicola Fixes #3852. r? @flodiebold Co-authored-by: Laurențiu Nicola <[email protected]>
| * | | Fix inference of function pointer return typesLaurențiu Nicola2020-04-052-1/+31
|/ / /
* | | Merge #3849bors[bot]2020-04-041-10/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3849: Cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | | Cargo updatekjeremy2020-04-041-10/+10
|/ / /
* | | Merge #3848bors[bot]2020-04-042-53/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3848: Remove unused dependencies r=kjeremy a=est31 Found by cargo-udeps Co-authored-by: est31 <[email protected]>
| * | | Remove unused dependenciesest312020-04-042-53/+0
| | |/ | |/|
* | | Merge #3844bors[bot]2020-04-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3844: vscode: restore removed default values r=matklad a=Veetaha After refactoring the config we forgot to set defaults for some properties like workspaceLoaded, callInfo.full, etc. This commit restored them to being turned on by defult, as well added defaults for other props to be more explicit on their defualt value. cc @matklad Co-authored-by: veetaha <[email protected]>
| * | | vscode: restore removed default valuesveetaha2020-04-041-0/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | After refactoring the config we forgot to set defaults for some properties like workspaceLoaded, callInfo.full, etc. This commit restored them to being turned on by defult, as well added defaults for other props to be more explicit on their defualt value.
* | | Merge #3845bors[bot]2020-04-041-9/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3845: Simplify config r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]>
| * | | Remove explicit generic type parameterveetaha2020-04-041-1/+1
| | | |
| * | | Simplify configveetaha2020-04-041-9/+8
| |/ /
* | | Merge #3846bors[bot]2020-04-041-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 3846: vscode: log server binary path r=matklad a=Veetaha Co-authored-by: veetaha <[email protected]>
| * | vscode: log server binary pathveetaha2020-04-041-0/+2
|/ /
* | Merge #3840bors[bot]2020-04-037-127/+236
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3840: Add parens for enums r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Add parens for enumsAleksey Kladov2020-04-034-46/+175
| | |
| * | Generalize call parenthesis insertionAleksey Kladov2020-04-031-27/+46
| | |
| * | Remove the second code-path for completing names in patternsAleksey Kladov2020-04-034-70/+31
| | |
* | | Merge #3837bors[bot]2020-04-031-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 3837: Include grammar for syntax trees into vsix r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Include grammar for syntax trees into vsixAleksey Kladov2020-04-031-0/+1
|/ /
* | Merge #3836bors[bot]2020-04-038-30/+100
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3836: Macro patterns are not confused with expressions. r=matklad a=matklad We treat macro calls as expressions (there's appropriate Into impl), which causes problem if there's expresison and non-expression macro in the same node (like in the match arm). We fix this problem by nesting macor patterns into another node (the same way we nest path into PathExpr or PathPat). Ideally, we probably should add a similar nesting for macro expressions, but that needs some careful thinking about macros in blocks: `{ am_i_expression!() }`. bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Macro patterns are not confused with expressions.Aleksey Kladov2020-04-037-17/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We treat macro calls as expressions (there's appropriate Into impl), which causes problem if there's expresison and non-expression macro in the same node (like in the match arm). We fix this problem by nesting macor patterns into another node (the same way we nest path into PathExpr or PathPat). Ideally, we probably should add a similar nesting for macro expressions, but that needs some careful thinking about macros in blocks: `{ am_i_expression!() }`.
| * | CleanupsAleksey Kladov2020-04-032-14/+13
|/ /
* | Merge #3834bors[bot]2020-04-031-3/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | 3834: Set semantic tokens supertypes r=matklad a=matklad bors r+ Co-authored-by: Aleksey Kladov <[email protected]>
| * | Set semantic tokens supertypesAleksey Kladov2020-04-031-3/+6
| | |