-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
⬆️ rust-analyzer 2022-11-28 #105834
⬆️ rust-analyzer 2022-11-28 #105834
Commits on Jul 26, 2022
-
Merge commit 'e36a20c24f35a4cee82bbdc600289104c9237c22' into ra-sync-…
…and-pms-component
Configuration menu - View commit details
-
Copy full SHA for a1f1b95 - Browse repository at this point
Copy the full SHA a1f1b95View commit details
Commits on Aug 2, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 9d2cb42 - Browse repository at this point
Copy the full SHA 9d2cb42View commit details
Commits on Aug 6, 2022
-
proc_macro/bridge: send diagnostics over the bridge as a struct
This removes some RPC when creating and emitting diagnostics, and simplifies the bridge slightly. After this change, there are no remaining methods which take advantage of the support for `&mut` references to objects in the store as arguments, meaning that support for them could technically be removed if we wanted. The only remaining uses of immutable references into the store are `TokenStream` and `SourceFile`.
Configuration menu - View commit details
-
Copy full SHA for 2c7f2c1 - Browse repository at this point
Copy the full SHA 2c7f2c1View commit details
Commits on Aug 9, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 22c8c9c - Browse repository at this point
Copy the full SHA 22c8c9cView commit details
Commits on Aug 16, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 8231fee - Browse repository at this point
Copy the full SHA 8231feeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3a1aa37 - Browse repository at this point
Copy the full SHA 3a1aa37View commit details
Commits on Aug 18, 2022
-
Rollup merge of rust-lang#100643 - TaKO8Ki:point-at-type-parameter-sh…
…adowing-another-type, r=estebank Point at a type parameter shadowing another type This patch fixes a part of rust-lang#97459.
Configuration menu - View commit details
-
Copy full SHA for 1347018 - Browse repository at this point
Copy the full SHA 1347018View commit details
Commits on Aug 23, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 31519bb - Browse repository at this point
Copy the full SHA 31519bbView commit details
Commits on Aug 30, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 3e358a6 - Browse repository at this point
Copy the full SHA 3e358a6View commit details
Commits on Sep 1, 2022
-
Auto merge of rust-lang#100210 - mystor:proc_macro_diag_struct, r=eddyb
proc_macro/bridge: send diagnostics over the bridge as a struct This removes some RPC when creating and emitting diagnostics, and simplifies the bridge slightly. After this change, there are no remaining methods which take advantage of the support for `&mut` references to objects in the store as arguments, meaning that support for them could technically be removed if we wanted. The only remaining uses of immutable references into the store are `TokenStream` and `SourceFile`. r? `@eddyb`
Configuration menu - View commit details
-
Copy full SHA for c1918fc - Browse repository at this point
Copy the full SHA c1918fcView commit details
Commits on Sep 6, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 65e1dc4 - Browse repository at this point
Copy the full SHA 65e1dc4View commit details
Commits on Sep 13, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 459bbb4 - Browse repository at this point
Copy the full SHA 459bbb4View commit details
Commits on Sep 20, 2022
-
Configuration menu - View commit details
-
Copy full SHA for f5fde4d - Browse repository at this point
Copy the full SHA f5fde4dView commit details
Commits on Sep 27, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 6f13f12 - Browse repository at this point
Copy the full SHA 6f13f12View commit details
Commits on Oct 2, 2022
-
Fix duplicate usage of
a
article.This fixes a typo first appearing in rust-lang#94624 in which test-macro diagnostic uses "a" article twice. Since I searched sources for " a a " sequences, I also fixed the same issue in a few source files where I found it. Signed-off-by: Petr Portnov <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for ed532e5 - Browse repository at this point
Copy the full SHA ed532e5View commit details
Commits on Oct 8, 2022
-
Auto merge of rust-lang#2583 - RalfJung:rustup, r=oli-obk
initial josh subtree sync This demonstrates what a josh-based rustup would look like with my patched josh. To create it I did ``` git fetch http://localhost:8000/rust-lang/rust.git:start=75dd959a3a40eb5b4574f8d2e23aa6efbeb33573[:prefix=src/tools/miri]:/src/tools/miri.git master git merge FETCH_HEAD ./rustup-toolchain HEAD && ./miri fmt git commit -am rustup ``` Unlike the [previous attempt](rust-lang/miri#2554), this does not add a new root commit to the repo. Once we merge this, we committed to using josh for subtree syncing, and in particular a version of josh that includes josh-project/josh#961 (or something compatible).
Configuration menu - View commit details
-
Copy full SHA for 02ae3d5 - Browse repository at this point
Copy the full SHA 02ae3d5View commit details
Commits on Oct 9, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 3a57388 - Browse repository at this point
Copy the full SHA 3a57388View commit details
Commits on Oct 11, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 4f55ebb - Browse repository at this point
Copy the full SHA 4f55ebbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8536eb0 - Browse repository at this point
Copy the full SHA 8536eb0View commit details
Commits on Oct 12, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 4b61e5e - Browse repository at this point
Copy the full SHA 4b61e5eView commit details
Commits on Oct 18, 2022
-
Configuration menu - View commit details
-
Copy full SHA for a99a48e - Browse repository at this point
Copy the full SHA a99a48eView commit details
Commits on Oct 21, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 26a413e - Browse repository at this point
Copy the full SHA 26a413eView commit details
Commits on Oct 26, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 8807fc4 - Browse repository at this point
Copy the full SHA 8807fc4View commit details
Commits on Nov 1, 2022
-
Configuration menu - View commit details
-
Copy full SHA for c60b1f6 - Browse repository at this point
Copy the full SHA c60b1f6View commit details
Commits on Nov 5, 2022
-
It's easy to just use `unescape_literal` + `byte_from_char`.
Configuration menu - View commit details
-
Copy full SHA for 7d2a1ee - Browse repository at this point
Copy the full SHA 7d2a1eeView commit details
Commits on Nov 9, 2022
-
Rollup merge of rust-lang#103919 - nnethercote:unescaping-cleanups, r…
…=matklad Unescaping cleanups Some code improvements, and some error message improvements. Best reviewed one commit at a time. r? ````@matklad````
Configuration menu - View commit details
-
Copy full SHA for a65ca91 - Browse repository at this point
Copy the full SHA a65ca91View commit details -
Configuration menu - View commit details
-
Copy full SHA for 79923c3 - Browse repository at this point
Copy the full SHA 79923c3View commit details
Commits on Nov 10, 2022
-
Rollup merge of rust-lang#104211 - lnicola:rust-analyzer-2022-11-09, …
…r=lnicola ⬆️ rust-analyzer r? ``@ghost``
Configuration menu - View commit details
-
Copy full SHA for 61c744d - Browse repository at this point
Copy the full SHA 61c744dView commit details
Commits on Nov 12, 2022
-
Configuration menu - View commit details
-
Copy full SHA for f26d548 - Browse repository at this point
Copy the full SHA f26d548View commit details
Commits on Nov 19, 2022
-
feat: adds hover hint to ".." in record pattern
currently only works with struct pattern
Configuration menu - View commit details
-
Copy full SHA for 0ffb361 - Browse repository at this point
Copy the full SHA 0ffb361View commit details -
Configuration menu - View commit details
-
Copy full SHA for a778203 - Browse repository at this point
Copy the full SHA a778203View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8b17681 - Browse repository at this point
Copy the full SHA 8b17681View commit details -
change struct_rest_pat to guarentee a HoverResult Move token and node matching out of struct_rest_pat into hover
Configuration menu - View commit details
-
Copy full SHA for 87658c8 - Browse repository at this point
Copy the full SHA 87658c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 29951f9 - Browse repository at this point
Copy the full SHA 29951f9View commit details -
Update crates/ide-completion/src/context.rs
Co-authored-by: Lukas Wirth <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for a6d0e34 - Browse repository at this point
Copy the full SHA a6d0e34View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7a568f7 - Browse repository at this point
Copy the full SHA 7a568f7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 23cfe07 - Browse repository at this point
Copy the full SHA 23cfe07View commit details
Commits on Nov 20, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 427b63b - Browse repository at this point
Copy the full SHA 427b63bView commit details
Commits on Nov 21, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 95b4a74 - Browse repository at this point
Copy the full SHA 95b4a74View commit details -
Add assist to generate trait impl's
Mihail Mihov committedNov 21, 2022 Configuration menu - View commit details
-
Copy full SHA for ecb15ca - Browse repository at this point
Copy the full SHA ecb15caView commit details -
Reduce trigger range of
generate_impl
assist and update testsMihail Mihov committedNov 21, 2022 Configuration menu - View commit details
-
Copy full SHA for 0bd11f8 - Browse repository at this point
Copy the full SHA 0bd11f8View commit details -
Combine
generate_impl
andgenerate_trait_impl
into a single fileMihail Mihov committedNov 21, 2022 Configuration menu - View commit details
-
Copy full SHA for 469f620 - Browse repository at this point
Copy the full SHA 469f620View commit details -
Fix: Handle empty
checkOnSave/target
valuesThis fixes a regression introduced by rust-lang#13290, in which failing to set `checkOnSave/target` (or `checkOnSave/targets`) would lead to an invalid config.
Configuration menu - View commit details
-
Copy full SHA for b116fe9 - Browse repository at this point
Copy the full SHA b116fe9View commit details
Commits on Nov 23, 2022
-
Configuration menu - View commit details
-
Copy full SHA for a2a1d99 - Browse repository at this point
Copy the full SHA a2a1d99View commit details
Commits on Nov 24, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 2300c9d - Browse repository at this point
Copy the full SHA 2300c9dView commit details -
Auto merge of rust-lang#13667 - Veykril:detached-files-sysroot, r=Vey…
…kril Handle sysroot config in detached-files workspaces
Configuration menu - View commit details
-
Copy full SHA for 81d26e7 - Browse repository at this point
Copy the full SHA 81d26e7View commit details -
Auto merge of rust-lang#13576 - Bben01:supress_missing_impl_inside_bl…
…ock, r=jonas-schievink Suppress "Implement default members" inside contained items Fixes rust-lang#13561
Configuration menu - View commit details
-
Copy full SHA for 63a676e - Browse repository at this point
Copy the full SHA 63a676eView commit details -
Auto merge of rust-lang#13661 - iredelmeier:fix-null-checkonsave-targ…
…et, r=jonas-schievink Fix: Handle empty `checkOnSave/target` values This fixes a regression introduced by rust-lang#13290, in which failing to set `checkOnSave/target` (or `checkOnSave/targets`) would lead to an invalid config. [Fixes rust-lang#13660]
Configuration menu - View commit details
-
Copy full SHA for e9f6087 - Browse repository at this point
Copy the full SHA e9f6087View commit details -
Configuration menu - View commit details
-
Copy full SHA for c8b6fef - Browse repository at this point
Copy the full SHA c8b6fefView commit details -
Auto merge of rust-lang#13669 - Veykril:jod-child, r=Veykril
Properly implement Drop for JodGroupChild
Configuration menu - View commit details
-
Copy full SHA for fbc0f7a - Browse repository at this point
Copy the full SHA fbc0f7aView commit details -
Auto merge of rust-lang#13592 - MihailMihov:trait_impl_assist, r=Veykril
Add assist to generate trait impl's resolves rust-lang#13553 This pull request adds a `generate_trait_impl` assist, which generates trait impl's for a type. It is almost the same as the one to generate impl's and I also reduced the trigger range to only outside the `RecordFieldList`. Also moved all the tests into separate test functions. A few of the old tests seemed redundant, so I didn't port them.
Configuration menu - View commit details
-
Copy full SHA for 5e3ad5d - Browse repository at this point
Copy the full SHA 5e3ad5dView commit details -
Auto merge of rust-lang#13652 - jhgg:hir-expand/fix-compile-error-exp…
…ansion, r=Veykril hir-expand: fix compile_error! expansion not unquoting strings expanding `compile_error!` would not properly unquote strings, leading to quite ugly diagnostic messages: ![image](https://user-images.githubusercontent.com/5489149/202893481-2486ede8-c79a-4972-9713-416d6a704064.png) this fixes it, using the conveniently placed `unquote_str` function, which now makes errors look like: ![image](https://user-images.githubusercontent.com/5489149/202893466-0763efad-9240-4d55-80a6-6c62000d5d2b.png) additionally, using `unquote_str` has the cool side-effect of *also* handling raw strings, so this fixes a fixme too!
Configuration menu - View commit details
-
Copy full SHA for 76e2e41 - Browse repository at this point
Copy the full SHA 76e2e41View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9fba39f - Browse repository at this point
Copy the full SHA 9fba39fView commit details -
Auto merge of rust-lang#13670 - Veykril:derive-helper, r=Veykril
Add `deriveHelper` to `semanticTokenTypes` section of package.json
Configuration menu - View commit details
-
Copy full SHA for 1e6a49a - Browse repository at this point
Copy the full SHA 1e6a49aView commit details
Commits on Nov 25, 2022
-
Correct node traversal to look at parent instead
Co-authored-by: Lukas Wirth <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for f64feeb - Browse repository at this point
Copy the full SHA f64feebView commit details -
Configuration menu - View commit details
-
Copy full SHA for 132d5ff - Browse repository at this point
Copy the full SHA 132d5ffView commit details -
Configuration menu - View commit details
-
Copy full SHA for e86d451 - Browse repository at this point
Copy the full SHA e86d451View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91e7624 - Browse repository at this point
Copy the full SHA 91e7624View commit details -
Configuration menu - View commit details
-
Copy full SHA for a26aef9 - Browse repository at this point
Copy the full SHA a26aef9View commit details -
Auto merge of rust-lang#13638 - DesmondWillowbrook:hover-rest-pat-mvp…
…, r=Veykril feat: adds hover hint to ".." in record pattern Hovering on the "rest" pattern in struct destructuring, ```rust struct Baz { a: u32, b: u32, c: u32, d: u32 } let Baz { a, b, ..$0} = Baz { a: 1, b: 2, c: 3, d: 4 }; ``` shows: ``` .., c: u32, d: u32 ``` Currently only works with struct patterns. ![image](https://user-images.githubusercontent.com/51814158/202837115-f424cc26-c2d7-4027-8eea-eeb7749ad146.png)
Configuration menu - View commit details
-
Copy full SHA for 6918009 - Browse repository at this point
Copy the full SHA 6918009View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3c794a3 - Browse repository at this point
Copy the full SHA 3c794a3View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae0bdff - Browse repository at this point
Copy the full SHA ae0bdffView commit details -
Auto merge of rust-lang#13671 - Veykril:goto-decl, r=Veykril
Improve goto declaration Closes rust-lang/rust-analyzer#13599 - goto decl now goes to assoc items of trait declarations over the items of trait implementations - goto decl now goes to the field declaration (opposed to goto def which shows both the field decl and binding created/local being used) - also adds back the goto definition fallback that seems to have been dropped at some point.
Configuration menu - View commit details
-
Copy full SHA for 99daf23 - Browse repository at this point
Copy the full SHA 99daf23View commit details -
Auto merge of rust-lang#13647 - nyz93:fix/tuple-to-named-struct, r=Ve…
…ykril fix: tuple to named struct inside macros seems to fix rust-lang#13634
Configuration menu - View commit details
-
Copy full SHA for e668eca - Browse repository at this point
Copy the full SHA e668ecaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2566e06 - Browse repository at this point
Copy the full SHA 2566e06View commit details -
Configuration menu - View commit details
-
Copy full SHA for db84a00 - Browse repository at this point
Copy the full SHA db84a00View commit details -
Configuration menu - View commit details
-
Copy full SHA for 03a723e - Browse repository at this point
Copy the full SHA 03a723eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2374c0b - Browse repository at this point
Copy the full SHA 2374c0bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 797ee29 - Browse repository at this point
Copy the full SHA 797ee29View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6ac43ec - Browse repository at this point
Copy the full SHA 6ac43ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8117027 - Browse repository at this point
Copy the full SHA 8117027View commit details -
Configuration menu - View commit details
-
Copy full SHA for ff2b468 - Browse repository at this point
Copy the full SHA ff2b468View commit details -
Configuration menu - View commit details
-
Copy full SHA for ae878f2 - Browse repository at this point
Copy the full SHA ae878f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 318fdac - Browse repository at this point
Copy the full SHA 318fdacView commit details -
Configuration menu - View commit details
-
Copy full SHA for be2fca9 - Browse repository at this point
Copy the full SHA be2fca9View commit details -
Configuration menu - View commit details
-
Copy full SHA for dec148e - Browse repository at this point
Copy the full SHA dec148eView commit details -
Configuration menu - View commit details
-
Copy full SHA for b355362 - Browse repository at this point
Copy the full SHA b355362View commit details -
Configuration menu - View commit details
-
Copy full SHA for 969e250 - Browse repository at this point
Copy the full SHA 969e250View commit details -
Configuration menu - View commit details
-
Copy full SHA for bc9b613 - Browse repository at this point
Copy the full SHA bc9b613View commit details -
Configuration menu - View commit details
-
Copy full SHA for e6540cf - Browse repository at this point
Copy the full SHA e6540cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 299c293 - Browse repository at this point
Copy the full SHA 299c293View commit details -
Configuration menu - View commit details
-
Copy full SHA for 251b18a - Browse repository at this point
Copy the full SHA 251b18aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2dbda1a - Browse repository at this point
Copy the full SHA 2dbda1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f65294 - Browse repository at this point
Copy the full SHA 2f65294View commit details -
Configuration menu - View commit details
-
Copy full SHA for 682a4de - Browse repository at this point
Copy the full SHA 682a4deView commit details -
Configuration menu - View commit details
-
Copy full SHA for e070dc5 - Browse repository at this point
Copy the full SHA e070dc5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8514f3f - Browse repository at this point
Copy the full SHA 8514f3fView commit details -
Configuration menu - View commit details
-
Copy full SHA for ae43043 - Browse repository at this point
Copy the full SHA ae43043View commit details -
Configuration menu - View commit details
-
Copy full SHA for d9e16c8 - Browse repository at this point
Copy the full SHA d9e16c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for e96c0b1 - Browse repository at this point
Copy the full SHA e96c0b1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 38c98d1 - Browse repository at this point
Copy the full SHA 38c98d1View commit details -
Auto merge of rust-lang#13676 - fasterthanlime:subtree-fix, r=Veykril
Mega-sync from `rust-lang/rust` This essentially implements `@oli-obk's` suggestion here rust-lang/rust-analyzer#13459 (comment), with `@eddyb's` help. This PR is equivalent to 14 syncs (back and forth) between `rust-lang/rust` and `rust-lang/rust-analyzer`. Working from this list (from bottom to top): ``` (x) a2a1d99 ⬆️ rust-analyzer (x) 79923c3 ⬆️ rust-analyzer (x) c60b1f6 ⬆️ rust-analyzer (x) 8807fc4 ⬆️ rust-analyzer (x) a99a48e ⬆️ rust-analyzer (x) 4f55ebb ⬆️ rust-analyzer (x) f5fde4d ⬆️ rust-analyzer (x) 459bbb4 ⬆️ rust-analyzer (x) 65e1dc4 ⬆️ rust-analyzer (x) 3e358a6 ⬆️ rust-analyzer (x) 31519bb ⬆️ rust-analyzer (x) 8231fee ⬆️ rust-analyzer (x) 22c8c9c ⬆️ rust-analyzer (x) 9d2cb42 ⬆️ rust-analyzer ``` (This listed was assembled by doing a `git subtree push`, which made a branch, and looking at the new commits in that branch, picking only those that were `⬆️ rust-analyzer` commits) We used the following commands to simulate merges in both directions: ```shell TO_MERGE=22c8c9c40 # taken from the list above, bottom to top git merge --no-edit --no-ff $TO_MERGE git merge --no-edit --no-ff $(git -C ../rust log --pretty=format:'%cN | %s | %ad => %P' | rg -m1 -F "$(git show --no-patch --pretty=format:%ad $TO_MERGE)" | tee /dev/stderr | rg '.* => \S+ (\S+)$' --replace '$1') ``` We encountered no merge conflicts that Git wasn't able to solve by doing it this way. Here's what the commit graph looks like (as shown in the Git Lens VSCode extension): <img width="1345" alt="image" src="https://user-images.githubusercontent.com/7998310/203984523-7c1a690a-8224-416c-8015-ed6e49667066.png"> This PR closes rust-lang#13459 ## Does this unbreak `rust->ra` syncs? Yes, here's how we tried: In `rust-analyzer`: * check out `subtree-fix` (this PR's branch) * make a new branch off of it: `git checkout -b subtree-fix-merge-test` * simulate this PR getting merged with `git merge master` In `rust`: * pull latest master * make a new branch: `git checkout -b test-change` * mess with rust-analyzer (I added a comment to `src/tools/rust-analyzer/Cargo.toml`) * commit * run `git subtree push -P src/tools/rust-analyzer ra-local final-sync` (this follows the [Clippy sync guide](https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html)) This created a `final-sync` branch in `rust-analyzer`. In `rust-analyzer`: * `git merge --no-ff final-sync` (this follows the [Clippy sync guide](https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html)) Now `git log` in `rust-analyzer` shows this: ``` commit 460128387e46ddfc2b95921b2d7f6e913a3d2b9f (HEAD -> subtree-fix-merge-test) Merge: 0513fc02a 9ce6a734f Author: Amos Wenger <[email protected]> Date: Fri Nov 25 13:28:24 2022 +0100 Merge branch 'final-sync' into subtree-fix-merge-test commit 0513fc02a08ea9de952983624bd0a00e98044b36 Merge: 38c98d1 6918009 Author: Amos Wenger <[email protected]> Date: Fri Nov 25 13:28:02 2022 +0100 Merge branch 'master' into subtree-fix-merge-test commit 9ce6a734f37ef8e53689f1c6f427a9efafe846bd (final-sync) Author: Amos Wenger <[email protected]> Date: Fri Nov 25 13:26:26 2022 +0100 Mess with rust-analyzer just for fun ``` And `git diff 0513fc02a08ea9de952983624bd0a00e98044b36` shows this: ```patch diff --git a/Cargo.toml b/Cargo.toml index 286ef1e7d..c9e24cd19 100644 --- a/Cargo.toml +++ b/Cargo.toml `@@` -32,3 +32,5 `@@` debug = 0 # ungrammar = { path = "../ungrammar" } # salsa = { path = "../salsa" } + +# lol, hi ``` ## Does this unbreak `ra->rust` syncs? Yes, here's how we tried. From `rust`: * `git checkout -b sync-from-ra` * `git subtree pull -P src/tools/rust-analyzer ra-local subtree-fix-merge-test` (this is adapted from the [Clippy sync guide](https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html#performing-the-sync-from-clippy-to-rust-langrust), you would normally use `ra-upstream master` but we're simulating things here) A commit editor pops up, there was no merge conflicts. ## How do we prevent this from happening again? Like `@bjorn3` said in rust-lang/rust-analyzer#13459 (comment) > Whenever syncing from rust-analyzer -> rust you have to immediately sync the merge commit from rust -> rust-analyzer to prevent merge conflicts in the future. But if we get it wrong again, at least now we have a not-so-painful way to fix it.
Configuration menu - View commit details
-
Copy full SHA for b651646 - Browse repository at this point
Copy the full SHA b651646View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7bf2a25 - Browse repository at this point
Copy the full SHA 7bf2a25View commit details -
Auto merge of rust-lang#13678 - Veykril:hir-file-encode, r=Veykril
Encode the variants of `HirFileId` in a u32 with MSB as the tag This saves 10mb on `self` analysis, while this does limit us to 2billion real files and 2 billion macro expansions, I doubt we will ever hit that limit :) `HirFileId` is used a lot, so going from 8 bytes to 4 is a decent win.
Configuration menu - View commit details
-
Copy full SHA for d2281f0 - Browse repository at this point
Copy the full SHA d2281f0View commit details
Commits on Nov 26, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 822c61f - Browse repository at this point
Copy the full SHA 822c61fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8e03f18 - Browse repository at this point
Copy the full SHA 8e03f18View commit details -
Configuration menu - View commit details
-
Copy full SHA for e1de04d - Browse repository at this point
Copy the full SHA e1de04dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1ca5cb7 - Browse repository at this point
Copy the full SHA 1ca5cb7View commit details -
Auto merge of rust-lang#13611 - yue4u:fix/completion-after-colon, r=y…
…ue4u fix: filter unnecessary completions after colon close rust-lang#13597 related: rust-lang#10173 This PR also happens to fix two extra issues: 1. The test case in https://github.com/rust-lang/rust-analyzer/blob/master/crates/ide-completion/src/tests/attribute.rs#L778-L801 was never triggered in previous behavior. after: https://user-images.githubusercontent.com/26110087/201476995-56adf955-0fa7-4f75-ab32-28a8e6cb9504.mp4 <del> 2. completions were triggered even in invalid paths, like ```rust fn main() { core:::::$0 } ``` ```rust #[:::::$0] struct X; ``` </del> only `:::` is excluded as discussed in rust-lang/rust-analyzer#13611 (comment)
Configuration menu - View commit details
-
Copy full SHA for 34e2bc6 - Browse repository at this point
Copy the full SHA 34e2bc6View commit details
Commits on Nov 27, 2022
-
Auto merge of rust-lang#13681 - lowr:fix/extract-function-tail-expr, …
…r=Veykril fix: check tail expressions more precisely in `extract_function` Fixes rust-lang#13620 When extracting expressions with control flows into a function, we can avoid wrapping tail expressions in `Option` or `Result` when they are also tail expressions of the container we're extracting from (see rust-lang#7840, rust-lang#9773). This is controlled by `ContainerInfo::is_in_tail`, but we've been computing it by checking if the tail expression of the range to extract is contained in the container's syntactically last expression, which may be a block that contains both tail and non-tail expressions (e.g. in rust-lang#13620, the range to be extracted is not a tail expression but we set the flag to true). This PR tries to compute the flag as precise as possible by utilizing `for_each_tail_expr()` (and also moves the flag to `Function` struct as it's more of a property of the function to be extracted than of the container).
Configuration menu - View commit details
-
Copy full SHA for 6d61be8 - Browse repository at this point
Copy the full SHA 6d61be8View commit details
Commits on Dec 17, 2022
-
⬆️ rust-analyzer to 2022-11-28
The prior update included checkOnSave multiple targets: rust-lang/rust-analyzer#13290 but missed the fix for the regression it caused: rust-lang/rust-analyzer#13661 Merge commit '6d61be8e65ac0fd45eaf178e1f7a1ec6b582de1f'
Configuration menu - View commit details
-
Copy full SHA for 46bdefc - Browse repository at this point
Copy the full SHA 46bdefcView commit details