diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-23 09:19:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 09:19:28 -0500 |
commit | 3de14d9ca0cf54e6a2ae4eac5ff47e38e724b77b (patch) | |
tree | 146663967a55d8f72997b1da71f8b973579ebd6b /python | |
parent | 14dc1199dfe9c3815c580a73452e7bf4ba26998d (diff) | |
parent | 6807bb615fc4c151dd6cee49ba6a023d4c741d71 (diff) | |
download | servo-3de14d9ca0cf54e6a2ae4eac5ff47e38e724b77b.tar.gz servo-3de14d9ca0cf54e6a2ae4eac5ff47e38e724b77b.zip |
Auto merge of #11835 - servo:diy-as-unsafe-cell, r=nox
Use our copy of RefCell for style data
<!-- Please describe your changes on the following line: -->
This allows removing `#![feature(as_unsafe_cell)]` in geckolib and make progress towards #11815.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix part of #11815.
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require new tests because they don’t introduce no functional changes.
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11835)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r-- | python/tidy/servo_tidy/licenseck.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/python/tidy/servo_tidy/licenseck.py b/python/tidy/servo_tidy/licenseck.py index a67713b4421..ce5fdee075d 100644 --- a/python/tidy/servo_tidy/licenseck.py +++ b/python/tidy/servo_tidy/licenseck.py @@ -69,5 +69,16 @@ licenses = [ // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your // option. This file may not be copied, modified, or distributed // except according to those terms. -""" +""", + +"""\ +// Copyright 2012-2014 The Rust Project Developers. +// See 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 +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. +""", ] # noqa: Indicate to flake8 that we do not want to check indentation here |