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

Mark RawTable::data_start NonNull #387

Merged
merged 1 commit into from
May 4, 2023

Conversation

stepancheg
Copy link
Contributor

@stepancheg stepancheg commented Jan 14, 2023

For consistency with RawTable::data_end which is NonNull.

@Amanieu
Copy link
Member

Amanieu commented Jan 22, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 22, 2023

📌 Commit 8f80170 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jan 22, 2023

🔒 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 data-start-non-null (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 data-start-non-null --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 src/raw/mod.rs
CONFLICT (content): Merge conflict in src/raw/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Collaborator

bors commented Jan 22, 2023

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

@Amanieu
Copy link
Member

Amanieu commented Feb 22, 2023

ping @stepancheg

Could you resolve the merge conflict?

1 similar comment
@Amanieu
Copy link
Member

Amanieu commented May 2, 2023

ping @stepancheg

Could you resolve the merge conflict?

For consistency with RawTable::data_start which is `NonNull`.
@stepancheg
Copy link
Contributor Author

Sorry. Done.

@Amanieu
Copy link
Member

Amanieu commented May 4, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented May 4, 2023

📌 Commit f347aea has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented May 4, 2023

⌛ Testing commit f347aea with merge f76a340...

@bors
Copy link
Collaborator

bors commented May 4, 2023

☀️ Test successful - checks-actions
Approved by: Amanieu
Pushing f76a340 to master...

@bors bors merged commit f76a340 into rust-lang:master May 4, 2023
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants