Skip to content

Rustup #11469

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

Merged
merged 15 commits into from
Sep 7, 2023
Merged

Rustup #11469

merged 15 commits into from
Sep 7, 2023

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Sep 7, 2023

r? @ghost

changelog: none

RalfJung and others added 13 commits August 24, 2023 13:28
Update Clippy

r? `@oli-obk` Assigning you, because something broke with ui_test:

```
tests/ui/crashes/ice-7272.rs FAILED:
command: "<unknown>"

A bug in `ui_test` occurred: called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }

full stderr:

```

(and that 103 times)

Thought I would ping you, before starting to investigate. Maybe you know what's going on.
Use relative positions inside a SourceFile.

This allows to remove the normalization of start positions for hashing, and simplify allocation of global address space.

cc `@Zoxc`
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Sep 7, 2023
@rustbot
Copy link
Collaborator

rustbot commented Sep 7, 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:

@flip1995
Copy link
Member Author

flip1995 commented Sep 7, 2023

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Sep 7, 2023

📌 Commit d780573 has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 7, 2023

⌛ Testing commit d780573 with merge 2de89ea...

bors added a commit that referenced this pull request Sep 7, 2023
Rustup

r? `@ghost`

changelog: none
@bors
Copy link
Contributor

bors commented Sep 7, 2023

💔 Test failed - checks-action_test

@flip1995
Copy link
Member Author

flip1995 commented Sep 7, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Sep 7, 2023

📌 Commit 25e8639 has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 7, 2023

⌛ Testing commit 25e8639 with merge 94ecf26...

bors added a commit that referenced this pull request Sep 7, 2023
Rustup

r? `@ghost`

changelog: none
@bors
Copy link
Contributor

bors commented Sep 7, 2023

💔 Test failed - checks-action_test

@flip1995
Copy link
Member Author

flip1995 commented Sep 7, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Sep 7, 2023

📌 Commit 05e387d has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 7, 2023

⌛ Testing commit 05e387d with merge 65ab51d...

bors added a commit that referenced this pull request Sep 7, 2023
Rustup

r? `@ghost`

changelog: none
@flip1995
Copy link
Member Author

flip1995 commented Sep 7, 2023

@bors r+

4th times the charm or something...

@bors
Copy link
Contributor

bors commented Sep 7, 2023

📌 Commit 184c971 has been approved by flip1995

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 7, 2023

⌛ Testing commit 184c971 with merge 253f1c4...

@bors
Copy link
Contributor

bors commented Sep 7, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 253f1c4 to master...

@bors bors merged commit 253f1c4 into rust-lang:master Sep 7, 2023
@flip1995 flip1995 deleted the rustup branch September 7, 2023 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

8 participants