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

Documentation fix due to latest changes in the crate. #363

Merged
merged 4 commits into from
Oct 9, 2022

Conversation

JustForFun88
Copy link
Contributor

Due to merged PR #357, #362 I think that we need to fix docummentation.

Fixed broken links in HashMap::raw_table and HashSet::raw_table, as well as some typos and mistakes elsewhere (especially in EntryRef::or_insert_with_key).

To fix #349, I removed capacity comparisons in all places (except drain and clear), however left the phrase "keeps the allocated memory for reuse", because although the erase method may not release the capacity, the subsequent rehash_in_place function definitely will release all.

Close #349.

@JustForFun88
Copy link
Contributor Author

Rust / test (ubuntu-latest, i586-unknown-linux-gnu, nightly) tests fail because of: error: linking with cc failed: exit status: 1??

@JustForFun88
Copy link
Contributor Author

Issue rust-lang/rust#102703

Copy link
Member

@Amanieu Amanieu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! This is a great improvement to the documentation.

src/map.rs Outdated Show resolved Hide resolved
@Amanieu
Copy link
Member

Amanieu commented Oct 8, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Oct 8, 2022

📌 Commit dfe2496 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 8, 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 fix_doc (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 fix_doc --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/map.rs
CONFLICT (content): Merge conflict in src/map.rs
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Oct 8, 2022

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

@Amanieu
Copy link
Member

Amanieu commented Oct 9, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Oct 9, 2022

📌 Commit 47bc623 has been approved by Amanieu

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 9, 2022

⌛ Testing commit 47bc623 with merge 101b8de...

@bors
Copy link
Contributor

bors commented Oct 9, 2022

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

@bors bors merged commit 101b8de into rust-lang:master Oct 9, 2022
@JustForFun88 JustForFun88 deleted the fix_doc branch October 9, 2022 10:27
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.

doctests for HashMap::drain_filter and HashMap::retain inconsistently fail on armv7-unknown-linux-gnueabihf
3 participants