rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Make rustdoc.js use license comments.

Browse Source
This commit is contained in:
Clar Charr
2017-05-30 00:17:11 -04:00
parent 03eb7109c7
commit dd23fda9bd
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustdoc/html/static/main.js
View File

@@ -1,12 +1,14 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT /*!
// file at the top-level directory of this distribution and at * Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// http://rust-lang.org/COPYRIGHT. * file at the top-level directory of this distribution and at
// * http://rust-lang.org/COPYRIGHT.
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or *
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license * Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your * http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// option. This file may not be copied, modified, or distributed * <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// except according to those terms. * option. This file may not be copied, modified, or distributed
* except according to those terms.
*/
/*jslint browser: true, es5: true */ /*jslint browser: true, es5: true */
/*globals $: true, rootPath: true */ /*globals $: true, rootPath: true */

4
src/tools/tidy/src/style.rs
View File

@@ -169,8 +169,10 @@ fn licenseck(file: &Path, contents: &str) -> bool {
lines.windows(LICENSE.lines().count()).any(|window| { lines.windows(LICENSE.lines().count()).any(|window| {
let offset = if window.iter().all(|w| w.starts_with("//")) { let offset = if window.iter().all(|w| w.starts_with("//")) {
2 2
} else if window.iter().all(|w| w.starts_with("#")) { } else if window.iter().all(|w| w.starts_with('#')) {
1 1
} else if window.iter().all(|w| w.starts_with(" *")) {
2
} else { } else {
return false return false
}; };