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

use strict provenance APIs on nightly #390

Merged
merged 3 commits into from Mar 24, 2023

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Feb 4, 2023

This makes hashbrown compatible with strict provenance, which helps Miri in ensuring pointers are used correctly.

Fixes #384

@RalfJung
Copy link
Member Author

RalfJung commented Feb 4, 2023

Clippy has a bunch of complaints but those are not introduced by this PR.

@RalfJung
Copy link
Member Author

RalfJung commented Feb 4, 2023

Strangely I don't see any permissive provenance warnings in the CI job for the first commit. Looks like these ZST code paths do not get executed in the test suite. I added a test for one of them, not sure how to reach the other ones.

@Amanieu
Copy link
Member

Amanieu commented Feb 22, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 22, 2023

📌 Commit 22bddc8 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Feb 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 strict-provenance (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 strict-provenance --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/set.rs
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 Feb 22, 2023

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

@RalfJung
Copy link
Member Author

@Amanieu I have rebased and resolved the conflicts.

@Amanieu
Copy link
Member

Amanieu commented Mar 24, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 24, 2023

📌 Commit dd6aceb has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Mar 24, 2023

⌛ Testing commit dd6aceb with merge ae3e67b...

@bors
Copy link
Collaborator

bors commented Mar 24, 2023

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

@bors bors merged commit ae3e67b into rust-lang:master Mar 24, 2023
25 checks passed
@RalfJung RalfJung deleted the strict-provenance branch May 14, 2023 10:04
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.

hashbrown is not following strict provenance
3 participants