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

Remove hidden foo functions from doc examples; use Termination trait. #49357

Merged
merged 1 commit into from
Mar 28, 2018

Conversation

frewsxcv
Copy link
Member

@frewsxcv frewsxcv commented Mar 25, 2018

Fixes #49233.

Easier to review with the white-space ignoring ?w=1 feature: https://github.com/rust-lang/rust/pull/49357/files?w=1

@rust-highfive
Copy link
Collaborator

r? @aidanhs

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2018
@frewsxcv frewsxcv force-pushed the frewsxcv-termination-doc-examples branch from 3c8e7bf to ca8d233 Compare March 25, 2018 19:14
@frewsxcv
Copy link
Member Author

r? @rust-lang/docs

@GuillaumeGomez
Copy link
Member

Are we sure we want to display the main function? Wouldn't it work if we didn't add the main function? My concern here is that it adds more content, which makes the examples longer and less pertinent.

@steveklabnik
Copy link
Member

We do want to display main, IMO. The issue with this was people copy/pasting the docs and them being wrong; we hid the foo functions because they were so much noise, but the new main is not much noise at all.

@frewsxcv
Copy link
Member Author

for posterity, asked this in irc last week, here's the logs: https://botbot.me/mozilla/rust-docs/2018-03-21/?msg=98071184&page=1

@GuillaumeGomez
Copy link
Member

Ah I see the goal now. Well sounds good to me, so unless someone else finds a bug, r=me.

@frewsxcv frewsxcv force-pushed the frewsxcv-termination-doc-examples branch from ca8d233 to 1d49a49 Compare March 28, 2018 09:25
@frewsxcv frewsxcv force-pushed the frewsxcv-termination-doc-examples branch from 1d49a49 to e9dcec0 Compare March 28, 2018 11:15
@frewsxcv
Copy link
Member Author

@bors r=GuillaumeGomez rollup

@bors
Copy link
Contributor

bors commented Mar 28, 2018

📌 Commit e9dcec0 has been approved by GuillaumeGomez

@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 28, 2018
@kennytm
Copy link
Member

kennytm commented Mar 28, 2018

@bors rollup- p=113

Given the diff amount I think rolling it up might be quite risky.

@bors
Copy link
Contributor

bors commented Mar 28, 2018

⌛ Testing commit e9dcec0 with merge e5277c1...

bors added a commit that referenced this pull request Mar 28, 2018
…GuillaumeGomez

Remove hidden `foo` functions from doc examples; use `Termination` trait.

Fixes #49233.

Easier to review with the white-space ignoring `?w=1` feature: https://github.com/rust-lang/rust/pull/49357/files?w=1
@bors
Copy link
Contributor

bors commented Mar 28, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing e5277c1 to master...

@bors bors merged commit e9dcec0 into rust-lang:master Mar 28, 2018
@frewsxcv frewsxcv deleted the frewsxcv-termination-doc-examples branch March 28, 2018 21:03
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.

7 participants