Skip to content
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

[DO NOT MERGE] Sync from ra experiment #117544

Closed
wants to merge 198 commits into from

Conversation

HKalbasi
Copy link
Member

@HKalbasi HKalbasi commented Nov 3, 2023

r? @ghost

Young-Flash and others added 19 commits October 14, 2023 11:05
fix typo in mbe/lib.rs comment

fix typo in mbe/lib.rs comment
make mir::ProjectionStore-impls pub-accessible

When using RA as a crate the `mir::Place` `projection` is accessible, however there is no way to translate the `ProjectionId` to a `&[PlaceElem]`, as the `ProjectionId::lookup` is private.

Personally, I would only need the `ProjectionId::lookup`-fn to be `pub`, but I don't see any reason why the others should be kept private.. am I missing something `@HKalbasi` ?

Relates to: rust-lang/rust-analyzer#15575
fix: make cursor select at _tmp

Here make cursor select at `_tmp` atuomatically after the assist apply. Refer to [vscode snippet placeholder](https://code.visualstudio.com/docs/editor/userdefinedsnippets#_placeholders).

![cursor_selection](https://github.com/rust-lang/rust-analyzer/assets/71162630/a7866efe-2d54-488b-903e-9df039f34a7e)

following rust-lang/rust-analyzer#15752
fix: Fix metrics workflow to use deploy key

I think this should be correct
Emacs 29 is now released, and include an example of enabling clippy.
Expand Emacs documentation

Emacs 29 is now released, and include an example of enabling clippy.
internal: Create `~/.ssh` before writing deploy key
…=Veykril

String literals diagnose

Continues the work from rust-lang#15744 to add diagnosis errors to Str, ByteStr, and CStr literal kinds.

Also replaces `unescape_char` for `unescape_byte` to use the correct method for Byte literals.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2023

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2023

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_afbc90a1-bfd6-47d2-9171-0223003d842f
GITHUB_EVENT_NAME=pull_request
GITHUB_EVENT_PATH=/home/runner/work/_temp/_github_workflow/event.json
GITHUB_GRAPHQL_URL=https://api.github.com/graphql
GITHUB_HEAD_REF=sync-from-ra-experiment
GITHUB_JOB=pr
GITHUB_PATH=/home/runner/work/_temp/_runner_file_commands/add_path_afbc90a1-bfd6-47d2-9171-0223003d842f
GITHUB_REF=refs/pull/117544/merge
GITHUB_REF_NAME=117544/merge
GITHUB_REF_PROTECTED=false
---
    Finished release [optimized] target(s) in 12.20s
##[endgroup]
##[group]Checking stage0 rust-analyzer artifacts (x86_64-unknown-linux-gnu -> i686-pc-windows-gnu)
    Updating crates.io index
error: the lock file /checkout/src/tools/rust-analyzer/Cargo.lock needs to be updated but --locked was passed to prevent this
If you want to try to generate the lock file without accessing the network, remove the --locked flag and use --offline instead.
  local time: Fri Nov  3 14:58:28 UTC 2023
  network time: Fri, 03 Nov 2023 14:58:29 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.