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

account for doc visibility #4611

Merged
merged 1 commit into from
Oct 8, 2019
Merged

account for doc visibility #4611

merged 1 commit into from
Oct 8, 2019

Conversation

llogiq
Copy link
Contributor

@llogiq llogiq commented Oct 2, 2019

This fixes #4608.

Also I noticed that the lint failed to look at trait and impl items. There's a small bit of fallout in the code, too, but not enough to warrant its own commit.

changelog: check docs of trait items and impl items, also make missing_safety_doc account for visibility

@flip1995
Copy link
Member

flip1995 commented Oct 2, 2019

Thanks!

I'm wondering if we should create a lint group for documentation lints 🤔

@bors r+

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit daddf80 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Oct 2, 2019

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

@bors
Copy link
Contributor

bors commented Oct 2, 2019

🔒 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 doc-visibility (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 doc-visibility --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_lints/src/lib.rs
Auto-merging clippy_lints/src/doc.rs
CONFLICT (content): Merge conflict in clippy_lints/src/doc.rs
Automatic merge failed; fix conflicts and then commit the result.

@llogiq
Copy link
Contributor Author

llogiq commented Oct 2, 2019

Failure was a network error at Travis.

@flip1995
Copy link
Member

flip1995 commented Oct 3, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Oct 3, 2019

📌 Commit e3f143f has been approved by flip1995

@bors
Copy link
Contributor

bors commented Oct 3, 2019

⌛ Testing commit e3f143f with merge e1a851d...

bors added a commit that referenced this pull request Oct 3, 2019
account for doc visibility

This fixes #4608.

Also I noticed that the lint failed to look at trait and impl items. There's a small bit of fallout in the code, too, but not enough to warrant its own commit.

changelog: check docs of trait items and impl items, also make `missing_safety_doc` account for visibility
@bors
Copy link
Contributor

bors commented Oct 3, 2019

💔 Test failed - status-appveyor

@llogiq
Copy link
Contributor Author

llogiq commented Oct 3, 2019

Same problem as #4592.

@flip1995
Copy link
Member

flip1995 commented Oct 3, 2019

Yeah, we got a pile of approved PRs that couldn't be merged because of that:
image

bors added a commit that referenced this pull request Oct 8, 2019
account for doc visibility

This fixes #4608.

Also I noticed that the lint failed to look at trait and impl items. There's a small bit of fallout in the code, too, but not enough to warrant its own commit.

changelog: check docs of trait items and impl items, also make `missing_safety_doc` account for visibility
@bors
Copy link
Contributor

bors commented Oct 8, 2019

⌛ Testing commit e3f143f with merge b690cdb...

@bors
Copy link
Contributor

bors commented Oct 8, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing b690cdb to master...

@bors bors merged commit e3f143f into master Oct 8, 2019
@flip1995 flip1995 deleted the doc-visibility branch October 28, 2019 08:14
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.

missing_safety_doc warning even on functions internal to crate
3 participants