From 505159a46446340b8f0c860d8dc100df8902e2bf Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 29 Jan 2015 12:16:41 +0100 Subject: Import the util crate as util rather than servo_util. 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. --- components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') 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', -- cgit v1.2.3