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

Make rustdoc.js use license comments. #42307

Merged
merged 1 commit into from
Jun 10, 2017
Merged

Make rustdoc.js use license comments. #42307

merged 1 commit into from
Jun 10, 2017

Conversation

clarfonthey
Copy link
Contributor

This will ensure that JS minifiers and the like will preserve the license statement even after minimisation.

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @frewsxcv

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

@GuillaumeGomez
Copy link
Member

I'm not sure to understand the point of this change. Can you give a bit more context please?

@frewsxcv
Copy link
Member

@GuillaumeGomez from what I understand, some JS minifiers have an option to preserve license headings so they don't get minified away, but I'm guessing that only works if the license headings are in a block comment. does that sound right @clarcharr?

@clarfonthey
Copy link
Contributor Author

That's correct.

@steveklabnik
Copy link
Member

steveklabnik commented May 30, 2017 •
edited
Loading

👍 from me, but there's a failure: https://travis-ci.org/rust-lang/rust/jobs/237377534#L900

You'll need to update tidy to understand this kind of heading. specifically, this part https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/style.rs#L151-L186, and even more specifically, this bit https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/style.rs#L170-L176 let me know if you need any help with that 😄

@aidanhs aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 1, 2017
frewsxcv
frewsxcv reviewed Jun 3, 2017
View reviewed changes
src/tools/tidy/src/style.rs Outdated
1
} else if window.iter().all(|w| w.starts_with(" *"))
Copy link
Member

Choose a reason for hiding this comment

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

You're missing a { at the end of this line

@arielb1
Copy link
Contributor

arielb1 commented Jun 6, 2017

@clarcharr are you going to fix this? Just checking to make sure this PR isn't getting lost.

@clarfonthey
Copy link
Contributor Author

I am and I have!

@frewsxcv
Copy link
Member

frewsxcv commented Jun 8, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 8, 2017

📌 Commit dd23fda has been approved by frewsxcv

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 8, 2017
@frewsxcv
Rollup merge of rust-lang#42307 - clarcharr:js-license, r=frewsxcv
1fcf332 
Make rustdoc.js use license comments.

This will ensure that JS minifiers and the like will preserve the license statement even after minimisation.
@frewsxcv frewsxcv mentioned this pull request Jun 8, 2017
Closed
bors added a commit that referenced this pull request Jun 8, 2017
@bors
Auto merge of #42536 - frewsxcv:rollup, r=frewsxcv
661bb22 
Rollup of 6 pull requests

- Successful merges: #42307, #42385, #42487, #42491, #42521, #42531
- Failed merges:
@frewsxcv frewsxcv mentioned this pull request Jun 9, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 9, 2017
@frewsxcv
Rollup merge of rust-lang#42307 - clarcharr:js-license, r=frewsxcv
9163f33 
Make rustdoc.js use license comments.

This will ensure that JS minifiers and the like will preserve the license statement even after minimisation.
@frewsxcv frewsxcv mentioned this pull request Jun 9, 2017
Merged
bors added a commit that referenced this pull request Jun 9, 2017
@bors
Auto merge of #42573 - frewsxcv:rollup, r=frewsxcv
60ac9f4 
Rollup of 5 pull requests

- Successful merges: #42307, #42385, #42531, #42551, #42558
- Failed merges:
@bors bors merged commit dd23fda into rust-lang:master Jun 10, 2017
@clarfonthey clarfonthey deleted the js-license branch June 10, 2017 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frewsxcv frewsxcv frewsxcv left review comments

Assignees

@frewsxcv frewsxcv

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@clarfonthey @rust-highfive @GuillaumeGomez @frewsxcv @steveklabnik @arielb1 @bors @aidanhs