Subtree update of `rust-analyzer` #120636

lnicola · 2024-02-04T08:38:41Z

r? ghost

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.

… macro

…ested use tree selections

…sted use tree selections

…m-ra

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

…m-ra

rustbot · 2024-02-04T08:38:46Z

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

lnicola · 2024-02-04T08:40:14Z

@bors r+ p=1 subtree sync

bors · 2024-02-04T08:40:16Z

📌 Commit 468f400 has been approved by lnicola

It is now in the queue for this repository.

lnicola · 2024-02-04T08:50:57Z

@bors r-

lnicola · 2024-02-04T09:56:38Z

@bors r+

bors · 2024-02-04T09:56:40Z

📌 Commit 98ad126 has been approved by lnicola

It is now in the queue for this repository.

Veykril · 2024-02-04T16:54:03Z

src/tools/rust-analyzer/crates/hir-ty/src/layout/target.rs

@@ -2,7 +2,7 @@

 use base_db::CrateId;
 use hir_def::layout::TargetDataLayout;
-use ra_ap_rustc_abi::{AlignFromBytesError, TargetDataLayoutErrors};


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.

Good idea, if possible. Now I'm wondering whether we build the ap crates when in-tree.

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 :/

alternatively we should prefer extern crate aliases when searching for paths I guess :p

…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

Rollup merge of rust-lang#120636 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ghost

Young-Flash and others added 30 commits January 22, 2024 18:49

feat: add conflict ext (panicbit.cargo) detect

e15f40e

fix lint and fmt

56f54c8

Fix copy/paste error.

85d56ee

The `CString` handling code is erroneously identical to the `ByteString` handling code.

Rename the unescaping functions.

858f4ac

`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.

minor: update conflict extension detect logic

96ebad0

make ast::UseTree::wrap_in_tree_list more robust

da798bc

Add postfix completion for let else

57934ac

Make return a snippet

51d57b9

Remove letelse control flow snippets

7ec32d0

feat: Support for GOTO def from *inside* files included with include!…

b22e772

… macro

normalize use trees when merging imports

8fab92f

remove ordered insert logic from recursive merge function

81d713e

add normalize import assist

a8a18f3

merge imports assist always applies to covering use item except for n…

b241593

…ested use tree selections

merge imports assist avoids adding unnecessary braces when merging ne…

fc00602

…sted use tree selections

add more tests for normalize import assist

84e1314

feat: enable excluding refs search results in test

6f303f4

test: add test for excluding refs

1bd21e9

Merge commit '7219414e81810fd4d967136c4a0650523892c157' into sync-fro…

f43cea0

…m-ra

fix: use Semantics to judge whether a func is marked as #[test]

6181102

test: add full path ref exclude test case

2b71aca

Auto merge of rust-lang#15730 - Alainx277:let-else-postfix, r=Veykril

d13951f

Add postfix completion for let else Adds a postfix completion for let else syntax, similar to the if let postfix.

Bump scip

20c0167

Cleanup error variants in MIR code slightly

5860763

Auto merge of rust-lang#16447 - Veykril:mir-errors, r=Veykril

11b401d

intenral: Cleanup error variants in MIR code a bit

minor: update warning msg

4facb62

style: remove unnecessary macro

dba3fc4

minor: correct typos

db9fd37

bors and others added 8 commits February 2, 2024 07:07

Auto merge of rust-lang#16476 - lnicola:sync-from-rust, r=lnicola

980d348

internal: sync from downstream

minor: correct some typos

ba2910a

internal: update .typos.tmol

70d6141

internal: update typo-check CI setting

a52a4d9

Auto merge of rust-lang#16469 - Young-Flash:ci_typos, r=lnicola

8f6a728

internal: add typos check CI (part 2) follow up rust-lang/rust-analyzer#16448

Bump release runners to MacOS 12

a605b96

Auto merge of rust-lang#16479 - lnicola:macos-12, r=lnicola

0113bc9

internal: Bump release runners to MacOS 12

Merge commit '0113bc9388b480fa42c632f57f4f0f7af5813ec1' into sync-fro…

468f400

…m-ra

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 4, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 4, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 4, 2024

Try to fix in-tree build

98ad126

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 2024

Veykril reviewed Feb 4, 2024

View reviewed changes

matthiaskrgr mentioned this pull request Feb 5, 2024

Rollup of 9 pull requests #120660

Merged

bors merged commit bc98f57 into rust-lang:master Feb 5, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 5, 2024

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2024

Unrolled build for rust-lang#120636

b7e03a6

Rollup merge of rust-lang#120636 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ghost

lnicola deleted the sync-from-ra branch February 5, 2024 08:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree update of `rust-analyzer` #120636

Subtree update of `rust-analyzer` #120636

lnicola commented Feb 4, 2024

rustbot commented Feb 4, 2024

lnicola commented Feb 4, 2024

bors commented Feb 4, 2024

This comment has been minimized.

lnicola commented Feb 4, 2024

lnicola commented Feb 4, 2024

bors commented Feb 4, 2024

Veykril Feb 4, 2024

lnicola Feb 4, 2024

Veykril Feb 4, 2024 •

edited

Loading

Veykril Feb 4, 2024

Subtree update of rust-analyzer #120636

Subtree update of rust-analyzer #120636

Conversation

lnicola commented Feb 4, 2024

rustbot commented Feb 4, 2024

lnicola commented Feb 4, 2024

bors commented Feb 4, 2024

This comment has been minimized.

lnicola commented Feb 4, 2024

lnicola commented Feb 4, 2024

bors commented Feb 4, 2024

Veykril Feb 4, 2024

Choose a reason for hiding this comment

lnicola Feb 4, 2024

Choose a reason for hiding this comment

Veykril Feb 4, 2024 • edited Loading

Choose a reason for hiding this comment

Veykril Feb 4, 2024

Choose a reason for hiding this comment

Subtree update of `rust-analyzer` #120636

Subtree update of `rust-analyzer` #120636

Veykril Feb 4, 2024 •

edited

Loading