Skip to content

Conversation

varkor
Copy link
Contributor

@varkor varkor 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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 13, 2019
@eddyb
Copy link
Member

eddyb commented Mar 14, 2019

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

@bors
Copy link
Collaborator

bors commented Mar 15, 2019

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

Copy link
Contributor

@QuietMisdreavus QuietMisdreavus left a comment

Choose a reason for hiding this comment

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

Some small comments. Thanks for writing this up!

@varkor varkor force-pushed the const-generics-rustdoc branch from f065096 to 9bc5811 Compare March 18, 2019 19:47
Copy link
Contributor

@QuietMisdreavus QuietMisdreavus left a comment

Choose a reason for hiding this comment

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

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

@varkor
Copy link
Contributor Author

varkor commented Mar 18, 2019

@bors r=QuietMisdreavus,eddyb

@bors
Copy link
Collaborator

bors commented Mar 18, 2019

📌 Commit 9bc5811 has been approved by QuietMisdreavus,eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2019
@varkor
Copy link
Contributor Author

varkor commented Mar 19, 2019

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 22, 2019
…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
…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
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 const-generics-rustdoc branch March 27, 2019 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants