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

Add const generics to rustdoc #59170

Merged
merged 10 commits into from Mar 23, 2019

Conversation

Projects
None yet
5 participants
@varkor
Copy link
Member

commented Mar 13, 2019

Split out from #53645. This work is a collaborative effort with @yodaldevoid.

The FIXMEs are waiting on a refactor to LazyConst. I'll address these in a follow up, but I thought it would be better to implement the rest now to avoid bitrot.

r? @QuietMisdreavus

Show resolved Hide resolved src/librustdoc/html/format.rs Outdated
@eddyb

This comment has been minimized.

Copy link
Member

commented Mar 14, 2019

r=me with the nit fixed, and maybe a review from @QuietMisdreavus too

@bors

This comment has been minimized.

Copy link
Contributor

commented Mar 15, 2019

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

@QuietMisdreavus
Copy link
Member

left a comment

Some small comments. Thanks for writing this up!

Show resolved Hide resolved src/librustdoc/clean/mod.rs Outdated
Show resolved Hide resolved src/librustdoc/html/format.rs Outdated

varkor and others added some commits Mar 13, 2019

Rename typarams to param_names
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Rename external_typarams to external_param_names
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Implement `Clean` for const generics
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Add `GenericArg`
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Refactor `GenericArgs` to include const generics
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>
Implement const generics in `generics_to_path_params`
Co-Authored-By: Gabriel Smith <yodaldevoid@users.noreply.github.com>

@varkor varkor force-pushed the varkor:const-generics-rustdoc branch from f065096 to 9bc5811 Mar 18, 2019

@QuietMisdreavus
Copy link
Member

left a comment

Looks good to me! r=me+eddyb when travis is green.

@varkor

This comment has been minimized.

Copy link
Member Author

commented Mar 18, 2019

@bors r=QuietMisdreavus,eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Mar 18, 2019

📌 Commit 9bc5811 has been approved by QuietMisdreavus,eddyb

@varkor

This comment has been minimized.

Copy link
Member Author

commented Mar 19, 2019

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 22, 2019

Rollup merge of rust-lang#59170 - varkor:const-generics-rustdoc, r=Qu…
…ietMisdreavus,eddyb

Add const generics to rustdoc

Split out from rust-lang#53645. This work is a collaborative effort with @yodaldevoid.

The `FIXME`s are waiting on a refactor to `LazyConst`. I'll address these in a follow up, but I thought it would be better to implement the rest now to avoid bitrot.

r? @QuietMisdreavus

Centril added a commit to Centril/rust that referenced this pull request Mar 22, 2019

Rollup merge of rust-lang#59170 - varkor:const-generics-rustdoc, r=Qu…
…ietMisdreavus,eddyb

Add const generics to rustdoc

Split out from rust-lang#53645. This work is a collaborative effort with @yodaldevoid.

The `FIXME`s are waiting on a refactor to `LazyConst`. I'll address these in a follow up, but I thought it would be better to implement the rest now to avoid bitrot.

r? @QuietMisdreavus

bors added a commit that referenced this pull request Mar 22, 2019

Auto merge of #59370 - Centril:rollup, r=Centril
Rollup of 18 pull requests

Successful merges:

 - #59106 (Add peer_addr function to UdpSocket)
 - #59170 (Add const generics to rustdoc)
 - #59172 (Update and clean up several parts of CONTRIBUTING.md)
 - #59190 (consistent naming for Rhs type parameter in libcore/ops)
 - #59236 (Rename miri component to miri-preview)
 - #59266 (Do not complain about non-existing fields after parse recovery)
 - #59273 (some small HIR doc improvements)
 - #59291 (Make Option<ThreadId> no larger than ThreadId, with NonZeroU64)
 - #59297 (convert field/method confusion help to suggestions)
 - #59304 (Move some bench tests back from libtest)
 - #59309 (Add messages for different verbosity levels. Output copy actions.)
 - #59321 (Unify E0109, E0110 and E0111)
 - #59322 (Tweak incorrect escaped char diagnostic)
 - #59323 (use suggestions for "enum instead of variant" error)
 - #59327 (Add NAN test to docs)
 - #59329 (cleanup: Remove compile-fail-fulldeps directory again)
 - #59347 (Move one test from run-make-fulldeps to ui)
 - #59360 (Add tracking issue number for `seek_convenience`)

Failed merges:

r? @ghost

@bors bors merged commit 9bc5811 into rust-lang:master Mar 23, 2019

@varkor varkor deleted the varkor:const-generics-rustdoc branch Mar 27, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.