Subtree update of rust-analyzer#120636
Merged
bors merged 93 commits intorust-lang:masterfrom Feb 5, 2024
Merged
Conversation
The `CString` handling code is erroneously identical to the `ByteString` handling code.
- Rename it as `MixedUnit`, because it will soon be used in more than just C string literals. - Change the `Byte` variant to `HighByte` and use it only for `\x80`..`\xff` cases. This fixes the old inexactness where ASCII chars could be encoded with either `Byte` or `Char`. - Add useful comments. - Remove `is_ascii`, in favour of `u8::is_ascii`.
`unescape_literal` becomes `unescape_unicode`, and `unescape_c_string` becomes `unescape_mixed`. Because rfc3349 will mean that C string literals will no longer be the only mixed utf8 literals.
…ested use tree selections
…sted use tree selections
Add postfix completion for let else Adds a postfix completion for let else syntax, similar to the if let postfix.
feat: Support for GOTO def from *inside* files included with include! macro close rust-lang#14937 Try to implement goto def from *inside* files included with include! macro. This implementation has two limitations: 1. Only **one** file which calls include! will be tracked. (I think multiple file be included is a rare case and we may let it go for now) 2. Mapping token from included file to macro call file (semantics.rs:646~658) works fine but I am not sure is this the correct way to implement.
intenral: Cleanup error variants in MIR code a bit
internal: sync from downstream
internal: add typos check CI (part 2) follow up rust-lang/rust-analyzer#16448
internal: Bump release runners to MacOS 12
rustbot
added
the
S-waiting-on-review
Collaborator
|
rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead. cc @rust-lang/rust-analyzer |
Member
Author
|
@bors r+ p=1 subtree sync |
Collaborator
bors
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
Member
Author
|
@bors r- |
bors
added
S-waiting-on-author
Member
Author
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
Veykril
reviewed
Feb 4, 2024
| use base_db::CrateId; | ||
| use hir_def::layout::TargetDataLayout; | ||
| use ra_ap_rustc_abi::{AlignFromBytesError, TargetDataLayoutErrors}; |
Member
There was a problem hiding this comment.
We should rename the ra_ap_rustc crates in the cargo toml dependencies to the in-tree ones instead of doing extern crate aliases to prevent this from happening again.
Member
Author
There was a problem hiding this comment.
Good idea, if possible. Now I'm wondering whether we build the ap crates when in-tree.
Member
There was a problem hiding this comment.
We do buildthem. There is no way around that without making those be feature gated I think, so not really an option to not build them (i'd rather not add more features for this stuff). I guess that means we can't rename the crates in the toml file :/
Member
There was a problem hiding this comment.
alternatively we should prefer extern crate aliases when searching for paths I guess :p
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 5, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119481 (Clarify ambiguity in select_nth_unstable docs) - rust-lang#119600 (Remove outdated references to librustc_middle) - rust-lang#120458 (Document `&CStr` to `CString` conversion) - rust-lang#120569 (coverage: Improve handling of function/closure spans) - rust-lang#120572 (Update libc to 0.2.153) - rust-lang#120587 (miri: normalize struct tail in ABI compat check) - rust-lang#120607 (fix rust-lang#120603 by adding a check in default_read_buf) - rust-lang#120636 (Subtree update of `rust-analyzer`) - rust-lang#120641 (rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 5, 2024
Rollup merge of rust-lang#120636 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
r? ghost