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

minor: sync from downstream #13924

Merged
merged 4 commits into from
Jan 10, 2023
Merged

minor: sync from downstream #13924

merged 4 commits into from
Jan 10, 2023

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Jan 10, 2023

No description provided.

RalfJung and others added 3 commits November 25, 2022 08:52
and fix the same typo in a bunch of other places
RefCell::get_mut: fix typo

and fix the same typo in a bunch of other places
Merge commit '368e0bb32f1178cf162c2ce5f7e10b7ae211eb26'
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2023
@lnicola
Copy link
Member Author

lnicola commented Jan 10, 2023

r? @arcnmx

@lnicola
Copy link
Member Author

lnicola commented Jan 10, 2023

Umm, these changes don't look right, where did they come from?

@lnicola
Copy link
Member Author

lnicola commented Jan 10, 2023

I think I'm running into the same issue as in #13459, so I must be doing something really wrong :(.

@lnicola
Copy link
Member Author

lnicola commented Jan 10, 2023

Okay, I think it's fine now?

@lnicola
Copy link
Member Author

lnicola commented Jan 10, 2023

r? @Veykril

Want to merge this so we unblock the other PRs?

@Veykril
Copy link
Member

Veykril commented Jan 10, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Jan 10, 2023

📌 Commit 13aa7a2 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 10, 2023

⌛ Testing commit 13aa7a2 with merge 8eb7522...

@lnicola lnicola changed the title internal: sync from downstream minor: sync from downstream Jan 10, 2023
@bors
Copy link
Contributor

bors commented Jan 10, 2023

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 8eb7522 to master...

@bors bors merged commit 8eb7522 into rust-lang:master Jan 10, 2023
@lnicola lnicola deleted the sync-from-rust branch January 10, 2023 17:05
@fasterthanlime
Copy link
Contributor

Okay, I think it's fine now?

Seeing this just now, do you remember what you did that went wrong and what you did to make it right? I see a "merge master into sync-from-rust" between the two comments but not sure what the timeline is exactly.

@lnicola
Copy link
Member Author

lnicola commented Feb 11, 2023

Not very well, but I think it was something really mundane like starting from a stale master branch.

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