diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-19 15:06:02 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-19 15:06:02 -0500 |
commit | f1dd31f70440fa9c7a40525bd1e03eede568f74d (patch) | |
tree | 903ebb4fb5ebd492dc63d4f21c522b4f23a85d7e /python/tidy/servo_tidy_tests | |
parent | 1ac6f435c8637d01279b51fecb535a19b639aea5 (diff) | |
parent | 1d6fe65401383bd01d30368d32eedcd908fa79ad (diff) | |
download | servo-f1dd31f70440fa9c7a40525bd1e03eede568f74d.tar.gz servo-f1dd31f70440fa9c7a40525bd1e03eede568f74d.zip |
Auto merge of #22198 - Darkspirit:mpl_https, r=jdm
Update MPL license to https
Current MPL license (https://www.mozilla.org/en-US/MPL/2.0/) contains an https link:
> This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
This change would not remove the summary above the LICENSE file. Tested [here](https://github.com/Darkspirit/darkspirit.github.io/blob/master/LICENSE).
I didn't update the `tests` folder with this change because I haven't yet looked into what needs to be considered with regards to WPT. Let's do that with a separate PR.
This change is splitted into multiple parts to prevent any "Load diff" button instead of a preview and was made with following commands:
```
git checkout -b mpl_https
kate python/tidy/servo_tidy/tidy.py
kate python/tidy/servo_tidy/licenseck.py
git add *
git commit -m "servo-tidy: Allow to use MPL with http and https"
find etc LICENSE mach ports python support -type f -not -path "python/tidy/servo_tidy/licenseck.py" -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 1)"
find components/script/dom/webidls -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 2)"
find components/script -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 3)"
find components -type f -print0 | xargs -0 sed -i 's,http://mozilla.org/MPL/2.0/,https://mozilla.org/MPL/2.0/,g'
git add *
git commit -m "Update MPL license to https (part 4)"
./mach test-tidy --all
git push origin HEAD
```
---
- [x] `./mach test-tidy` does not report any errors
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22198)
<!-- Reviewable:end -->
Diffstat (limited to 'python/tidy/servo_tidy_tests')
-rw-r--r-- | python/tidy/servo_tidy_tests/ban-domrefcell.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/ban.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/lib.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/long_line.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/multiline_string.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/rust_tidy.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/shebang_license.py | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/spec.webidl | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/speclink.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/whatwg_link.rs | 2 | ||||
-rw-r--r-- | python/tidy/servo_tidy_tests/wrong_space.rs | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/python/tidy/servo_tidy_tests/ban-domrefcell.rs b/python/tidy/servo_tidy_tests/ban-domrefcell.rs index 74b79e813cf..9bfc9ba8938 100644 --- a/python/tidy/servo_tidy_tests/ban-domrefcell.rs +++ b/python/tidy/servo_tidy_tests/ban-domrefcell.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #![feature(plugin)] #![plugin(script_plugins)] diff --git a/python/tidy/servo_tidy_tests/ban.rs b/python/tidy/servo_tidy_tests/ban.rs index fc5c600041a..9da46d2ee53 100644 --- a/python/tidy/servo_tidy_tests/ban.rs +++ b/python/tidy/servo_tidy_tests/ban.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #![feature(plugin)] #![plugin(script_plugins)] diff --git a/python/tidy/servo_tidy_tests/lib.rs b/python/tidy/servo_tidy_tests/lib.rs index 4ca395d8e6d..5fea057b5c5 100644 --- a/python/tidy/servo_tidy_tests/lib.rs +++ b/python/tidy/servo_tidy_tests/lib.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ #![feature(def)] #![feature(abc)] diff --git a/python/tidy/servo_tidy_tests/long_line.rs b/python/tidy/servo_tidy_tests/long_line.rs index cdc0b2045bc..4d2a0c5cf4f 100644 --- a/python/tidy/servo_tidy_tests/long_line.rs +++ b/python/tidy/servo_tidy_tests/long_line.rs @@ -1,5 +1,5 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ println!("really really loooooooooooooooooooooooooooooooooooooooooooong lineeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"); diff --git a/python/tidy/servo_tidy_tests/multiline_string.rs b/python/tidy/servo_tidy_tests/multiline_string.rs index 06f7fda7a96..0a4d2fa87ee 100644 --- a/python/tidy/servo_tidy_tests/multiline_string.rs +++ b/python/tidy/servo_tidy_tests/multiline_string.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // This puts a "multi-line string diff --git a/python/tidy/servo_tidy_tests/rust_tidy.rs b/python/tidy/servo_tidy_tests/rust_tidy.rs index a4d662e2c6e..4b6c35b85cb 100644 --- a/python/tidy/servo_tidy_tests/rust_tidy.rs +++ b/python/tidy/servo_tidy_tests/rust_tidy.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use app_units::Au; use azure::azure_hl::{ AntialiasMode, Color, ColorPattern, CompositionOp }; diff --git a/python/tidy/servo_tidy_tests/shebang_license.py b/python/tidy/servo_tidy_tests/shebang_license.py index 0499f3a93f9..f913d5ee1e4 100644 --- a/python/tidy/servo_tidy_tests/shebang_license.py +++ b/python/tidy/servo_tidy_tests/shebang_license.py @@ -1,4 +1,4 @@ #!/usr/bin/env python # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# file, You can obtain one at https://mozilla.org/MPL/2.0/. diff --git a/python/tidy/servo_tidy_tests/spec.webidl b/python/tidy/servo_tidy_tests/spec.webidl index 51993ea0d41..83ce8f935c3 100644 --- a/python/tidy/servo_tidy_tests/spec.webidl +++ b/python/tidy/servo_tidy_tests/spec.webidl @@ -1,7 +1,7 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ interface Test { diff --git a/python/tidy/servo_tidy_tests/speclink.rs b/python/tidy/servo_tidy_tests/speclink.rs index 81828055c06..499953e7bda 100644 --- a/python/tidy/servo_tidy_tests/speclink.rs +++ b/python/tidy/servo_tidy_tests/speclink.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ impl SpecLinkMethods for SpecLink { amacro!("Macros inside impls should trigger spec checks.") diff --git a/python/tidy/servo_tidy_tests/whatwg_link.rs b/python/tidy/servo_tidy_tests/whatwg_link.rs index e8edfbace49..d6ed712450a 100644 --- a/python/tidy/servo_tidy_tests/whatwg_link.rs +++ b/python/tidy/servo_tidy_tests/whatwg_link.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ // https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-putimagedata // https://html.spec.whatwg.org/#typographic-conventions diff --git a/python/tidy/servo_tidy_tests/wrong_space.rs b/python/tidy/servo_tidy_tests/wrong_space.rs index 50ee5de75b4..be735e2d463 100644 --- a/python/tidy/servo_tidy_tests/wrong_space.rs +++ b/python/tidy/servo_tidy_tests/wrong_space.rs @@ -1,6 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ pub struct TestStruct( pub testMember1: usize, |