aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3863 from Veetaha/feature/migrate-to-rastAleksey Kladov2020-04-07278-25/+23
|\ | | | | Migrate tests .txt -> .rast
| * Migrate tests .txt -> .rastveetaha2020-04-06278-25/+23
| | | | | | | | | | | | | | | | The sytax tree output files now use .rast extension (rust-analyzer syntax tree or rust abstract syntax tree (whatever)). This format has a editors/code/ra_syntax_tree.tmGrammar.json declaration that supplies nice syntax highlighting for .rast files.
* | Merge #3875bors[bot]2020-04-071-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3875: When making a release, just promote the latest nightly r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | When making a release, just promote the latest nightlyAleksey Kladov2020-04-071-2/+2
|/ /
* | Fix yamlAleksey Kladov2020-04-071-1/+1
| |
* | Fix yamlAleksey Kladov2020-04-071-1/+1
| |
* | Merge pull request #3866 from lnicola/fewer-bracesAleksey Kladov2020-04-0712-73/+73
|\ \ | | | | | | Fix unnecessary braces warnings
| * | Fix unnecessary braces warningsLaurențiu Nicola2020-04-0612-73/+73
| | |
* | | Merge #3874bors[bot]2020-04-071-6/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3874: Better config scheme & defaults r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Better config scheme & defaultsAleksey Kladov2020-04-071-6/+14
| | | |
* | | | Run analysis-stats nightlyAleksey Kladov2020-04-071-0/+4
| | | |
* | | | Merge #3872bors[bot]2020-04-071-15/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3872: fix cargo check config with custom command r=matklad a=JoshMcguigan fixes #3871 Previously if `get::<Vec<String>>(value, "/checkOnSave/overrideCommand")` returned `Some` we'd never execute `set(value, "/checkOnSave/command", command)`, even if the `overrideCommand` was empty. I am not sure of the best way to prove this, but I believe the LSP clients send this config with a default value if it is not set by the user, which means `get::<Vec<String>>(value, "/checkOnSave/overrideCommand")` would return `Some(vec![])` and thus we'd never set the command to the user specified value (in the case of #3871, "clippy"). I have tested this fix manually by installing this modified version of rust-analyzer and verifying I can see clippy lints in my editor (`coc.nvim`) with `rust-analyzer.checkOnSave.command": "clippy"`. As best I can tell this would have affected rustfmt extra args too, so this PR also applies the same fix there. Co-authored-by: Josh Mcguigan <[email protected]>
| * | | fix cargo check config with custom commandJosh Mcguigan2020-04-071-15/+25
|/ / /
* | | 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
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 03:14:22 +0000