diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-29 13:20:20 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-29 13:20:20 -0600 |
| commit | 7adc336aaacfb5e544a9c8c4e0387afa457e5d72 (patch) | |
| tree | fbcf55963f10e866598d54f5f3f3870a4e30becb | |
| parent | 28e163d6c44f1d85fbaea7f236da40972b6a63b1 (diff) | |
| parent | efa12e696371a7a15ba937d0fc256985de1bddaf (diff) | |
| download | servo-7adc336aaacfb5e544a9c8c4e0387afa457e5d72.tar.gz servo-7adc336aaacfb5e544a9c8c4e0387afa457e5d72.zip | |
Auto merge of #6809 - Ms2ger:unrooted_must_root, r=metajack
Remove unrooted_must_root annotation from unions (fixes #2661).
The unsafety was fixed as part of the SpiderMonkey upgrade; this removes the
now unused annotation.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6809)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index fecc98e8a9a..5ea35a14541 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3445,7 +3445,6 @@ class CGUnionStruct(CGThing): # XXXManishearth The following should be #[must_root], # however we currently allow it till #2661 is fixed return ("""\ -#[allow(unrooted_must_root)] pub enum %s { %s } |