Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-28 17:50:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7196 - frewsxcv:double-unsafe, r=jdm

Browse source 
Avoid marking codegen method bodies as unsafe twice

`CGAbstractMethod` takes a couple boolean parameters, among others:

* `extern`: will mark the method as `unsafe` and `extern`
* `unsafe`: will wrap the method body in an `unsafe` block

Passing both as `True` should not mark it as `unsafe` twice.

Example from a generated `HTMLCollectionBinding.rs`:

Before:

```
unsafe extern fn get_length(..) -> u8 {
    unsafe {
        // code here
    }
}
```

After

```
unsafe extern fn get_length(..) -> u8 {
    // code here
}
```

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7196)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-13 15:00:37 -06:00
commit 289decb064
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2089,7 +2089,9 @@ class CGAbstractMethod(CGThing):
def define(self):
body = self.definition_body()
if self.unsafe:
# Method will already be marked `unsafe` if `self.extern == True`
if self.unsafe and not self.extern:
body = CGWrapper(CGIndenter(body), pre="unsafe {\n", post="\n}")
return CGWrapper(CGIndenter(body),