diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-29 05:12:49 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-29 05:12:49 -0700 |
| commit | 27e0f16407629422b5e047e067d458142372c97e (patch) | |
| tree | 4f3a6a092be4c854201047521453a6efb109def8 /components/script/dom/bindings/codegen/CodegenRust.py | |
| parent | 5f4343e9c25ed4b617738abf299b50e1532df95f (diff) | |
| parent | 505159a46446340b8f0c860d8dc100df8902e2bf (diff) | |
| download | servo-27e0f16407629422b5e047e067d458142372c97e.tar.gz servo-27e0f16407629422b5e047e067d458142372c97e.zip | |
auto merge of #4766 : Ms2ger/servo/util, r=Manishearth
This used to conflict with the util crate from the standard library, which
has long since been removed.
The import in layout has not been changed because of a conflict with the
util mod there.
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 47dd912d700..63e58f2c03c 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -1677,7 +1677,7 @@ def UnionTypes(descriptors, dictionaries, callbacks, config): 'dom::types::*', 'js::jsapi::JSContext', 'js::jsval::JSVal', - 'servo_util::str::DOMString', + 'util::str::DOMString', ] # Now find all the things we'll need as arguments and return values because @@ -4587,7 +4587,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::str::ByteString', 'page::JSPageInfo', 'libc', - 'servo_util::str::DOMString', + 'util::str::DOMString', 'std::borrow::ToOwned', 'std::cmp', 'std::iter::repeat', |