-
Notifications
You must be signed in to change notification settings - Fork 13.7k
[rustdoc-json] Show whether ?Sized
parameters are actually Sized
#143559
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
base: master
Are you sure you want to change the base?
Conversation
|
This comment has been minimized.
This comment has been minimized.
I know this is WIP but if I may let me collect initial perf data (I've only skimmed the changes and haven't reviewed anything yet). [@]bors2 try [@]rust-timer queue |
This comment has been minimized.
This comment has been minimized.
Show whether `?Sized` parameters are actually `Sized` A mostly-working, "some polish still required" attempt at fixing #143197 - Add a new `allow_unsized: bool` field to `GenericParamDefKind::Type`. - Expose that field as-is to rustdoc JSON, without tampering with `?Sized` clauses there. - Suppress `?Sized` from HTML where `Sized` is implied. I haven't figured out a good way to suppress `?Sized` from `impl Trait` in function parameters in HTML yet. The synthetic generics data doesn't seem to be "nearby" so more refactoring might be needed. I included a failing test case to remind me of this. r? fmease
This comment has been minimized.
This comment has been minimized.
Finished benchmarking commit (55a9833): comparison URL. Overall result: ❌ regressions - please read the text belowBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 1.6%, secondary 2.4%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 2.4%, secondary 2.7%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 463.852s -> 465.016s (0.25%) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I've not looked at the impl).
I agree that we should probably remove these misleading bounds in HTML.
But I wounder if we should do the same in JSON? Rather than having a separate bool
field?
|
||
// Generic functions | ||
//@ is "$.index[?(@.name=='func_custom')].inner.function.generics.params[0].kind.type.allow_unsized" false | ||
pub fn func_custom<T: ?Sized + CustomSized>() {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should test that we don't remove the ?Sized
bound from the bounds list, even though it ends up not mattering.
It's a good question. I think there are two broadly-speaking reasonable choices, and one option we should avoid. We should avoid stripping Then the two broadly-acceptable options are both adding a bool, and differ over what the bool says:
I'm ambivalent between the two options, and could easily be talked into going for the second one if you have a strong preference that way. |
Taking a look at the benchmarks, I'm surprised that e.g. a simple "hello world" program takes 3% more instructions to document when there are no generics in it. This seems suspect — I wouldn't expect my code changes to get hit basically at all, let alone to the tune of a 3% slowdown. |
I'm strongly in favour if the first option. That way, consumers arn't required to look at that field if they don't need to.
EDIT: Stuff in here was incorrect, see fmeases comment below
pub fn foo<T: othercrate::Trait + ?Sized>(_t: T)
pub trait Trait {}
pub trait Trait: ?Sized {}
At the very least, the HTML change will want to go through a T-rustdoc-frontend fcp/poll. It's worth spinning of to a seperate PR, to unblock the JSON change. |
|
?Sized
parameters are actually Sized
?Sized
parameters are actually Sized
bba78b8
to
85e32ef
Compare
Updated to only include rustdoc JSON changes as suggested. If required, I plan to open a PR with the HTML changes separately after we have a final outcome on this PR. I've saved the old contents of the branch (including HTML changes and tests) under a different branch name. I believe this PR should now pass the rustdoc JSON test suite, and leave the HTML tests unchanged. I'm not sure what to do about the perf change, though it's possible removing the HTML changes has had some impact. It may be prudent to re-measure before we decide. @rustbot label -T-rustdoc-frontend |
rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi These commits modify Please ensure that if you've changed the output:
|
@bors2 try @rust-timer queue I’m happy this is the correct approach/behaviour/public api, but haven’t reviewed the implementation (yet). I’ll either do that in a week when I’m back from camping, or you could ask fmease (or someone else on T-Rustdoc) to do it beforehand. |
This comment has been minimized.
This comment has been minimized.
[rustdoc-json] Show whether `?Sized` parameters are actually `Sized`
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Finished benchmarking commit (c1707dd): comparison URL. Overall result: ❌ regressions - please read the text belowBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 1.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary 2.8%, secondary 2.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (secondary 0.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 471.66s -> 469.982s (-0.36%) |
☔ The latest upstream changes (presumably #145970) made this pull request unmergeable. Please resolve the merge conflicts. |
Perf effects seem real. Possibly due to increasing the size of |
// If this ends up being slow, then optimize it by reading the local bounds | ||
// (from all predicate origins) and check if a bound on `?Sized` is present. | ||
// If there's no `?Sized` bound, then definitely `allow_unsized = false`. | ||
let allow_unsized = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fmease would you mind reviewing this bit? I'm not familiar enough with how rustc/rustdoc represent generic bounds to be confident saying this is correct.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for taking a stab at implementing your proposal!
In my opinion, this PR is not ready to be merged yet because adding a flag to type parameters is not the correct approach as I've outlined in my review comments.
Moreover, it would be great if we could slightly improve the perf (I haven't looked at the impl yet, will do so later or some other time). I can say that these regressions are definitely not spurious. From experience I know that adding any query calls to hot clean
ing procedures will almost certainly regress perf due to query call overhead (here: of is_sized_raw
and evaluate_obligation
most likely, looking at the report)!
This might be a first, but ideally we'd gate that extra computation behind "backend==HTML" inside clean
if this PR remains perf-heavy.
/// Whether this type parameter can be instantiated with an unsized type. | ||
/// | ||
/// This is `true` if the parameter has a `?Sized` bound without any | ||
/// additional bounds that imply `Sized`. | ||
allow_unsized: bool, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This flag doesn't scale to associated types. Relaxed bounds are not just permitted on type parameters but also in the so-called item bounds of associated types. How would you represent allow unsized for
pub trait Trait { type Type: Bound + ?Sized; }
// ^^^^^^ effective or ineffective?
pub trait Bound/*: Sized*/ {}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Side note: This flag doesn't scale to (A) Sized Hierarchy (disclaimer: the RFC is still unapproved; impl unstable+incomplete) which gets rid the imprecise notion of "unsized" or (B) to the addition of other default traits apart from Sized
(disclaimer: only proposed so far in various venues; e.g., RFC 3783; impl internal+incomplete) and consequently also relaxed bounds (e.g., ?Move
, ?Leak
) which may likely appear in more places (e.g., in trait object types: dyn Trait + ?AutoBound
)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This flag doesn't scale to existential impl-Trait like RPIT(IT)s. How would you represent allow unsized for
pub fn make() -> Box<impl Bound + ?Sized> {
// ^^^^^^ effective or ineffective?
Box::new([]) as Box<[_]> // (1)
//Box::new([]) // (2)
}
pub trait Bound {} // (1)
impl Bound for [u8] {} // (1)
//pub trait Bound: Sized {} // (2)
//impl<const N: usize> Bound for [u8; N] {} // (2)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given these shortcomings, I would strongly advise against taking this approach / representation, even for an MVP.
Moreover, I know that your goal is to make rustdoc identify arbitrary redundant bounds (e.g., the Clone
in Copy + Clone
), so any scheme should be extensible enough to be able to represent this eventually I would say, wouldn't you?
The obvious alternative approach would be to add a redundant: bool
(redundant?: boolean
) to GenericBound::Trait
(well, and to GenericBound::Outlives
) which should be general enough to represent all aforementioned cases IINM.
// If this ends up being slow, then optimize it by reading the local bounds | ||
// (from all predicate origins) and check if a bound on `?Sized` is present. | ||
// If there's no `?Sized` bound, then definitely `allow_unsized = false`. | ||
let allow_unsized = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd strongly prefer if we didn't compute this for the HTML backend since it isn't used there (yet, if ever) and since it's still too perf-heavy for my liking.
use std::marker::PhantomData; | ||
|
||
pub trait CustomSized: Sized {} | ||
impl CustomSized for u8 {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(unused trait impl as far as I can tell)
An attempt at fixing #143197 for rustdoc JSON only, in order to streamline the review process. Any HTML changes will happen separately.
allow_unsized: bool
field toGenericParamDefKind::Type
.?Sized
clauses there.r? fmease