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

Some more fixes for transmute_undefined_repr #8440

Merged
merged 5 commits into from
Feb 18, 2022

Conversation

Jarcho
Copy link
Contributor

@Jarcho Jarcho commented Feb 16, 2022

changelog: Fix transmuting a struct containing a pointer into a pointer in transmute_undefined_repr
changelog: Allow various forms of type erasure in transmute_undefined_repr

@rust-highfive
Copy link

r? @Manishearth

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Feb 16, 2022
@Manishearth
Copy link
Member

Can we include the nurseryification and a comment linking to a followup about properly investigating this lint here?

@Jarcho
Copy link
Contributor Author

Jarcho commented Feb 18, 2022

Is there a particular reason to not merge this separately from that considering there's already a pr for it?

@Manishearth
Copy link
Member

@bors r+

nah it's fine

@bors
Copy link
Contributor

bors commented Feb 18, 2022

📌 Commit 1777841 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Feb 18, 2022

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout transmute_undefined (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self transmute_undefined --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging clippy_utils/src/ty.rs
CONFLICT (content): Merge conflict in clippy_utils/src/ty.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Feb 18, 2022

☔ The latest upstream changes (presumably #8381) made this pull request unmergeable. Please resolve the merge conflicts.

@Jarcho Jarcho force-pushed the transmute_undefined branch from 1777841 to d28d19d Compare February 18, 2022 20:02
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 18, 2022

📌 Commit d28d19d has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Feb 18, 2022

⌛ Testing commit d28d19d with merge 29ee5e2...

@bors
Copy link
Contributor

bors commented Feb 18, 2022

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Manishearth
Pushing 29ee5e2 to master...

@bors bors merged commit 29ee5e2 into rust-lang:master Feb 18, 2022
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.

4 participants