aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge #7611bors[bot]2021-02-094-49/+63
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7611: Cleanups r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | restore accidentally deleted testAleksey Kladov2021-02-091-0/+13
| | | |
| * | | More precise navigation to parentAleksey Kladov2021-02-093-10/+13
| | | |
| * | | Cleanup testsAleksey Kladov2021-02-093-55/+53
| | | |
* | | | Merge #7597bors[bot]2021-02-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7597: Set remote branch on xtask promote r=matklad a=lnicola to hopefully fix this: ``` $ git switch master Already on 'master' Your branch is up to date with 'upstream/master'. $ git fetch upstream $ git reset --hard upstream/master HEAD is now at 921ec4b3fca Auto merge of #81313 - LeSeulArtichaut:revert-32558, r=jyn514 $ git submodule update --recursive Submodule path 'src/tools/rust-analyzer': checked out '1a59f75cdaa730c16a694a4294eccf6dfe6fe0ad' $ git switch -c rust-analyzer-2021-02-08 Switched to a new branch 'rust-analyzer-2021-02-08' $ git fetch origin $ git reset --hard origin/release HEAD is now at 336909b63 Merge #7587 $ git add src/tools/rust-analyzer $ git commit "-m:arrow_up: rust-analyzer" [rust-analyzer-2021-02-08 1774ec1a683] :arrow_up: rust-analyzer 1 file changed, 1 insertion(+), 1 deletion(-) $ git push fatal: The current branch rust-analyzer-2021-02-08 has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin rust-analyzer-2021-02-08 Error: command `git push` failed, exit code: 128 ``` Co-authored-by: LaurenÈ›iu Nicola <[email protected]>
| * | | | Track remote branch on xtask promoteLaurențiu Nicola2021-02-091-1/+1
| | |/ / | |/| |
* | | | Merge #7610bors[bot]2021-02-093-217/+234
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | | | | | | | | | | | | 7610: Cleanup test r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Cleanup testAleksey Kladov2021-02-091-20/+21
| | |
| * | Fix highlighting of injected attributesAleksey Kladov2021-02-091-0/+44
| | |
| * | Modernize testsAleksey Kladov2021-02-091-197/+169
|/ /
* | Merge #7602bors[bot]2021-02-082-11/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | 7602: Check for dyn impls in method resolution r=flodiebold a=Veykril Fixes #6777 Co-authored-by: Lukas Wirth <[email protected]>
| * | Check for dyn impls in method resolutionLukas Wirth2021-02-082-11/+38
| | |
* | | Merge #7600bors[bot]2021-02-084-22/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7600: Update crates r=flodiebold a=kjeremy Pulls in https://github.com/rust-lang/chalk/pull/682 Co-authored-by: kjeremy <[email protected]>
| * | | Update crateskjeremy2021-02-084-22/+23
| | | | | | | | | | | | | | | | Pulls in https://github.com/rust-lang/chalk/pull/682
* | | | Merge #7599bors[bot]2021-02-081-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 7599: Add emacs guide r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Add emacs guideAleksey Kladov2021-02-081-0/+2
|/ / /
* | | Merge #7595bors[bot]2021-02-085-20/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7595: Add `config: &CargoConfig` parameter to `fn load_cargo(…)` r=matklad a=regexident For projects using rust-analyzer as a library it is desirable to be able to provide a custom-config to `fn load_cargo(…)` to pass features, etc, rather than having to copy & paste `fn load_cargo(…)` into one's project and maintain a fork of it and keep it in sync with upstream. Co-authored-by: Vincent Esche <[email protected]>
| * | | Consolidate `fn load_cargo(…)` parameters into `struct LoadCargoConfig ↵Vincent Esche2021-02-085-31/+70
| | | | | | | | | | | | | | | | { … }`
| * | | Add `config: &CargoConfig` parameter to `fn load_cargo(…)`Vincent Esche2021-02-085-7/+18
|/ / /
* | | Merge #7592bors[bot]2021-02-081-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7592: [Doc] Note about Eclipse IDE support r=lnicola a=mickaelistria Co-authored-by: Mickael Istria <[email protected]>
| * | | [Doc] Note about Eclipse IDE supportMickael Istria2021-02-081-0/+10
| | |/ | |/|
* | | Merge #7593bors[bot]2021-02-081-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7593: fix: add for keyword in completion #7588 r=lnicola a=gowrizrh Fixes #7588 bors r+ Co-authored-by: Gowri <[email protected]> Co-authored-by: Gowri <[email protected]>
| * | | chore: swap order of placeholdersGowri2021-02-081-1/+1
| | | |
| * | | ci: update relevant test case expected valuesGowri2021-02-071-0/+7
| | | |
| * | | fix: add for keyword in completion #7588Gowri2021-02-071-0/+1
| |/ /
* | | Merge #7549bors[bot]2021-02-081-5/+73
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7549: Documentation: Explain how initial configuration is sent over LSP and document vim-lsp r=ilya-bobyr a=ilya-bobyr This request contains two related but independent changes. The first explains `rust-analyzer` initial configuration over LSP. The second - adds documentation on `vim-lsp` Vim plugin and provides an example of the initial configuration for `rust-analyzer` when using this particular LSP client. Let me know if you would prefer the changes to be reviewed in two separate pull requests. Co-authored-by: Ilya Bobyr <[email protected]>
| * | Vim docs: vim-lsp with initial configuration.Ilya Bobyr2021-02-081-0/+46
| | | | | | | | | | | | | | | | | | `vim-lsp` is another popular LSP client for Vim. And, as there is no `rust-analyzer` specific UI, it is non-trivial to figure out how the initial configuration is performed.
| * | Explain how initial configuration is sent over LSP.Ilya Bobyr2021-02-081-5/+27
|/ /
* | Merge #7587bors[bot]2021-02-079-40/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7587: AdtDef -> Adt r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | AdtDef -> AdtAleksey Kladov2021-02-079-40/+40
|/ /
* | Merge #7586bors[bot]2021-02-071-1/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7586: Add a section on entry points r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Add a section on entry pointsAleksey Kladov2021-02-071-1/+9
|/ /
* | Fixing architecture image on dark themeErick Tovar2021-02-071-1/+1
| |
* | Merge #7585bors[bot]2021-02-071-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | 7585: More information for mbe in architecture.md r=edwin0cheng a=edwin0cheng bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * | Remove redunacnyEdwin Cheng2021-02-071-1/+1
| | |
| * | More information for mbeEdwin Cheng2021-02-071-2/+7
| | |
* | | Merge #7584bors[bot]2021-02-071-0/+11
|\| | | | | | | | | | | | | | | | | | | | | | | 7584: Update architecture.md for mbe and proc-macro r=edwin0cheng a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| * | Update architecture.md for mbe and proc-macroEdwin Cheng2021-02-071-0/+11
|/ /
* | Merge #7583bors[bot]2021-02-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 7583: Update architecture.md r=bjorn3 a=aTuck Typo Co-authored-by: Adam Tuck <[email protected]>
| * | Update architecture.mdAdam Tuck2021-02-061-1/+1
|/ / | | | | Typo
* | Merge #7578bors[bot]2021-02-062-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7578: Add a semantic token type for char literals r=Veykril a=petr-tik Fixes #7530 The LSP spec doesn't recognise character literals, so had to extend the suported types to our own custom type Co-authored-by: petr-tik <[email protected]>
| * | Add a semantic token type for char literalspetr-tik2021-02-052-1/+3
|/ / | | | | | | | | The LSP spec doesn't recognise character literals, so had to extend the suported types to our own custom type
* | Merge #7577bors[bot]2021-02-051-10/+10
|\ \ | |/ |/| | | | | | | | | | | 7577: cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * cargo updatekjeremy2021-02-051-10/+10
| |
* | Merge #7576bors[bot]2021-02-051-3/+3
|\ \ | |/ |/| | | | | | | | | | | | | 7576: Fix resolveCodeAction trying to edit files before creating them r=Veykril a=Veykril Fixes #7208 bors r+ Co-authored-by: Lukas Wirth <[email protected]>
| * Fix resolveCodeAction trying to edit files before creating themLukas Wirth2021-02-051-3/+3
| |
* | Merge #7575bors[bot]2021-02-052-7/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | 7575: Fix resolution of `self` module within blocks r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Test `super` resolution tooJonas Schievink2021-02-051-0/+2
| | |
| * | Fix resolution of `self` module within blocksJonas Schievink2021-02-052-7/+17
|/ /
* | Merge #7572bors[bot]2021-02-053-29/+30
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 7572: Add `find_or_create_impl_block` to assist utils r=matklad a=yoshuawuyts This is another continuation of https://github.com/rust-analyzer/rust-analyzer/pull/7562, introducing a small util to either find an `impl` block, or create a new one if none exists. I copied this code from the `generate_new` assist into https://github.com/rust-analyzer/rust-analyzer/pull/7562, and this unifies both into a helper. It doesn't feel super polished in its current state, but my hope is that this is enough of a starting point that it can be expanded on later. For example something that would be useful would be a flag which either returns the index of the start of the block, or the end of the block. Anyway, I hope this is useful. Thanks! Co-authored-by: Yoshua Wuyts <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 23:38:41 +0000