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.

Sign up for GitHub

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

Jump to bottom

Fixup some nits from #44238 #44329

Merged
merged 1 commit into from
Sep 10, 2017
Merged

Fixup some nits from #44238 #44329

merged 1 commit into from
Sep 10, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Sep 5, 2017

@nrc
Copy link
Member Author

nrc commented Sep 5, 2017

cc #44229

@nrc nrc mentioned this pull request Sep 5, 2017
Closed
10 tasks
@arielb1 arielb1 added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2017
ollie27
ollie27 reviewed Sep 5, 2017
View reviewed changes
Copy link
Member

@ollie27 ollie27 left a comment

Choose a reason for hiding this comment

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

Apart from that one error this looks good to me.

src/librustdoc/html/render.rs Outdated
}
if s.len() > 70 {
return format!("{} ... {}", &s[..50], &s[s.len()-20..]);
let mut lo = 70;
Copy link
Member

Choose a reason for hiding this comment

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

This should be 45 to make sure the resulting string is at most 70 characters.

Copy link
Member Author

Choose a reason for hiding this comment

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

Addressed this, thanks! I set to 50 (as in the old code), there is no strict need to be under 70 chars, it is just roughly a number that should fit on one line (comfortably under 80 chars).

Copy link
Member

Choose a reason for hiding this comment

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

Well that's okay but if the line is exactly 71 characters for example then using 50 will skip one character and replace it with " ... " making the string display actually longer. It's only a minor thing though.

@ollie27 ollie27 mentioned this pull request Sep 5, 2017
Merged
@nrc
Copy link
Member Author

nrc commented Sep 6, 2017

ping @ollie27 for re-review

@ollie27
Copy link
Member

ollie27 commented Sep 7, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 7, 2017

@ollie27: 🔑 Insufficient privileges: Not in reviewers

@nrc
Copy link
Member Author

nrc commented Sep 7, 2017

@bors: r=ollie27

@bors
Copy link
Contributor

bors commented Sep 7, 2017

📌 Commit 0573949 has been approved by ollie27

@Mark-Simulacrum
Copy link
Member

@bors rollup

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 9, 2017
@frewsxcv
Rollup merge of rust-lang#44329 - nrc:pulldown-warn-fix, r=ollie27
0dcfab9 
Fixup some nits from rust-lang#44238

r? @ollie27
@frewsxcv frewsxcv mentioned this pull request Sep 9, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Sep 9, 2017
@frewsxcv
Rollup merge of rust-lang#44329 - nrc:pulldown-warn-fix, r=ollie27
66becdc 
Fixup some nits from rust-lang#44238

r? @ollie27
@frewsxcv frewsxcv mentioned this pull request Sep 9, 2017
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 10, 2017
@GuillaumeGomez
Rollup merge of rust-lang#44329 - nrc:pulldown-warn-fix, r=ollie27
078e1c5 
Fixup some nits from rust-lang#44238

r? @ollie27
@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 10, 2017
Merged
bors added a commit that referenced this pull request Sep 10, 2017
@bors
Auto merge of #44474 - GuillaumeGomez:rollup, r=GuillaumeGomez
d290dec 
Rollup of 13 pull requests

- Successful merges: #44262, #44329, #44332, #44347, #44372, #44384, #44387, #44396, #44449, #44451, #44457, #44464, #44467
- Failed merges:
@bors bors merged commit 0573949 into rust-lang:master Sep 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ollie27 ollie27 ollie27 left review comments

Assignees
No one assigned
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nrc @ollie27 @bors @Mark-Simulacrum @arielb1