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

Changes to data produced by privacy pass #29822

Merged
merged 1 commit into from
Nov 20, 2015
Merged

Conversation

petrochenkov
Copy link
Contributor

This patch implements the plan described in https://internals.rust-lang.org/t/privacy-and-its-interaction-with-docs-lints-and-stability/2880 with one deviation.

It turns out, that rustdoc needs the "directly public" set for its docs inlining logic, so the privacy pass have to produce three sets and not two. Three is arguably too many, so I merged them in one map:
public_items/exported_items/reachable_items: NodeSet => access_levels: NodeMap<AccessLevel>

r? @alexcrichton

@bors
Copy link
Contributor

bors commented Nov 17, 2015

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

@petrochenkov
Copy link
Contributor Author

Updated.

self.ty_level(&ty)
}
hir::ItemImpl(_, _, _, Some(ref trait_ref), ref ty, _) => {
cmp::min(self.ty_level(&ty), self.trait_level(trait_ref))
Copy link
Member

Choose a reason for hiding this comment

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

This is some pretty slick usage of PartialOrd (and all the instances above)

@alexcrichton
Copy link
Member

Nice work, thanks @petrochenkov! (sorry for being a little slow to get to a review)

Do you think that this'll need a crater run? It looks pretty straigtforward to me, but I'm curious if you ran across anything while working on it. Also just making sure, but you've given the docs a glance to make sure nothing major is missing? (e.g. Vec)

@petrochenkov
Copy link
Contributor Author

Do you think that this'll need a crater run?

Probably not (though, in a perfect world a crater run on every PR would be nice :)

Also just making sure, but you've given the docs a glance to make sure nothing major is missing?

Yes, I usually use std::io as a smoke test - it contains plenty of items of all kinds.

@alexcrichton
Copy link
Member

@bors: r+ c1ad5af

Ok, cool, sounds good to me

@bors
Copy link
Contributor

bors commented Nov 20, 2015

⌛ Testing commit c1ad5af with merge 6a6b97c...

bors added a commit that referenced this pull request Nov 20, 2015
This patch implements the plan described in https://internals.rust-lang.org/t/privacy-and-its-interaction-with-docs-lints-and-stability/2880 with one deviation.

It turns out, that rustdoc needs the "directly public" set for its docs inlining logic, so the privacy pass have to produce three sets and not two. Three is arguably too many, so I merged them in one map:
`public_items/exported_items/reachable_items: NodeSet => access_levels: NodeMap<AccessLevel>`

r? @alexcrichton
@bors bors merged commit c1ad5af into rust-lang:master Nov 20, 2015
@petrochenkov petrochenkov deleted the pubexport branch November 22, 2015 11:41
bors added a commit that referenced this pull request Feb 18, 2016
Fixes #16734 and probably some other issues

This is a continuation of #29822, but the algorithm is mostly a copy of #29973, so
r? @alexcrichton or @nikomatsakis
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.

3 participants