diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-01 18:27:40 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-01 18:27:40 -0600 |
| commit | bbb39082e0f640400546d2084a450a8675820a82 (patch) | |
| tree | f531bb4d70d8eb6a1080d9711c29587c883bf0ce /components/script/dom/xmlhttprequest.rs | |
| parent | fc1e427ff9bb0e9891053ec1eba292530ebbe91a (diff) | |
| parent | 4cf46bff2d00f33a8866dc6880c8f6178fdf81a4 (diff) | |
| download | servo-bbb39082e0f640400546d2084a450a8675820a82.tar.gz servo-bbb39082e0f640400546d2084a450a8675820a82.zip | |
Auto merge of #6529 - dwins:master, r=Manishearth
Refactor #[jstraceable] to #[derive(JSTraceable)]
fixes #6524. I had to make an additional change not mentioned in the ticket - adding the `#[feature]` to enable deriving custom traits but I assume that's expected at this time.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6529)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/xmlhttprequest.rs')
| -rw-r--r-- | components/script/dom/xmlhttprequest.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 95a70b0cc6c..f618877f802 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -67,8 +67,7 @@ use dom::bindings::codegen::UnionTypes::StringOrURLSearchParams::{eString, eURLS pub type SendParam = StringOrURLSearchParams; -#[derive(PartialEq, Copy, Clone)] -#[jstraceable] +#[derive(JSTraceable, PartialEq, Copy, Clone)] enum XMLHttpRequestState { Unsent = 0, Opened = 1, @@ -77,8 +76,7 @@ enum XMLHttpRequestState { Done = 4, } -#[derive(PartialEq, Clone, Copy)] -#[jstraceable] +#[derive(JSTraceable, PartialEq, Clone, Copy)] pub struct GenerationId(u32); /// Closure of required data for each async network event that comprises the |