diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index facc68b42b3..7842e08bfa7 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2166,11 +2166,14 @@ def UnionTypes(descriptors, dictionaries, callbacks, config):
         'dom::bindings::conversions::root_from_handlevalue',
         'dom::bindings::error::throw_not_in_union',
         'dom::bindings::js::Root',
-        'dom::bindings::str::{ByteString, DOMString, USVString}',
+        'dom::bindings::str::ByteString',
+        'dom::bindings::str::DOMString',
+        'dom::bindings::str::USVString',
         'dom::types::*',
         'js::error::throw_type_error',
+        'js::jsapi::HandleValue',
         'js::jsapi::JSContext',
-        'js::jsapi::{HandleValue, MutableHandleValue}',
+        'js::jsapi::MutableHandleValue',
         'js::jsval::JSVal',
     ]
 
@@ -5321,95 +5324,216 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
 
     return CGImports(cgthings, descriptors, callbacks, dictionaries, enums, [
         'js',
-        'js::{JS_CALLEE, JSCLASS_GLOBAL_SLOT_COUNT}',
-        'js::{JSCLASS_IS_DOMJSCLASS, JSCLASS_IS_GLOBAL, JSCLASS_RESERVED_SLOTS_MASK}',
+        'js::JSCLASS_GLOBAL_SLOT_COUNT',
+        'js::JSCLASS_IS_DOMJSCLASS',
+        'js::JSCLASS_IS_GLOBAL',
+        'js::JSCLASS_RESERVED_SLOTS_MASK',
+        'js::JS_CALLEE',
         'js::error::throw_type_error',
-        'js::jsapi::{AutoIdVector, Call, CallArgs, GetPropertyKeys}',
-        'js::jsapi::{GetWellKnownSymbol, Handle, HandleId, HandleObject, HandleValue}',
-        'js::jsapi::{HandleValueArray, INTERNED_STRING_TO_JSID, IsCallable}',
-        'js::jsapi::{JS_AtomizeAndPinString, JS_CallFunctionValue, JS_CopyPropertiesFrom}',
-        'js::jsapi::{JS_DefineProperty, JS_DefinePropertyById2, JS_ForwardGetPropertyTo}',
-        'js::jsapi::{JS_GetClass, JS_GetErrorPrototype, JS_GetFunctionPrototype}',
-        'js::jsapi::{JS_GetGlobalForObject, JS_GetIteratorPrototype}',
-        'js::jsapi::{JS_GetObjectPrototype, JS_GetProperty, JS_GetPropertyById}',
-        'js::jsapi::{JS_GetPropertyDescriptorById, JS_GetReservedSlot, JS_HasProperty}',
-        'js::jsapi::{JS_HasPropertyById, JS_InitializePropertiesFromCompatibleNativeObject}',
-        'js::jsapi::{JS_NewObject, JS_NewObjectWithGivenProto, JS_NewObjectWithoutMetadata}',
-        'js::jsapi::{JS_SetImmutablePrototype, JS_SetProperty, JS_SetReservedSlot}',
-        'js::jsapi::{JS_SplicePrototype, JSAutoCompartment, JSCLASS_RESERVED_SLOTS_SHIFT}',
-        'js::jsapi::{JSClass, JSContext, JSFreeOp, JSFunctionSpec, JSITER_HIDDEN}',
-        'js::jsapi::{JSITER_OWNONLY, JSITER_SYMBOLS, JSJitGetterCallArgs, JSJitInfo}',
-        'js::jsapi::{JSJitInfo_AliasSet, JSJitInfo_ArgType, JSJitInfo_OpType}',
-        'js::jsapi::{JSJitMethodCallArgs, JSJitSetterCallArgs, JSNative, JSNativeWrapper}',
-        'js::jsapi::{JSObject, JSPROP_ENUMERATE, JSPROP_PERMANENT, JSPROP_READONLY}',
-        'js::jsapi::{JSPROP_SHARED, JSPropertySpec, JSString, JSTracer, JSType}',
-        'js::jsapi::{JSTypedMethodJitInfo, JSValueType, MutableHandle, MutableHandleObject}',
-        'js::jsapi::{MutableHandleValue, ObjectOpResult, PropertyDescriptor, RootedObject}',
-        'js::jsapi::{SymbolCode, jsid}',
+        'js::jsapi::AutoIdVector',
+        'js::jsapi::Call',
+        'js::jsapi::CallArgs',
+        'js::jsapi::FreeOp',
+        'js::jsapi::GetPropertyKeys',
+        'js::jsapi::GetWellKnownSymbol',
+        'js::jsapi::Handle',
+        'js::jsapi::HandleId',
+        'js::jsapi::HandleObject',
+        'js::jsapi::HandleValue',
+        'js::jsapi::HandleValueArray',
+        'js::jsapi::INTERNED_STRING_TO_JSID',
+        'js::jsapi::IsCallable',
+        'js::jsapi::JSAutoCompartment',
+        'js::jsapi::JSCLASS_RESERVED_SLOTS_SHIFT',
+        'js::jsapi::JSClass',
+        'js::jsapi::JSContext',
+        'js::jsapi::JSFreeOp',
+        'js::jsapi::JSFunctionSpec',
+        'js::jsapi::JSITER_HIDDEN',
+        'js::jsapi::JSITER_OWNONLY',
+        'js::jsapi::JSITER_SYMBOLS',
+        'js::jsapi::JSJitGetterCallArgs',
+        'js::jsapi::JSJitInfo',
+        'js::jsapi::JSJitInfo_AliasSet',
+        'js::jsapi::JSJitInfo_ArgType',
+        'js::jsapi::JSJitInfo_OpType',
+        'js::jsapi::JSJitMethodCallArgs',
+        'js::jsapi::JSJitSetterCallArgs',
+        'js::jsapi::JSNative',
+        'js::jsapi::JSNativeWrapper',
+        'js::jsapi::JSObject',
+        'js::jsapi::JSPROP_ENUMERATE',
+        'js::jsapi::JSPROP_PERMANENT',
+        'js::jsapi::JSPROP_READONLY',
+        'js::jsapi::JSPROP_SHARED',
+        'js::jsapi::JSPropertySpec',
+        'js::jsapi::JSString',
+        'js::jsapi::JSTracer',
+        'js::jsapi::JSType',
+        'js::jsapi::JSTypedMethodJitInfo',
+        'js::jsapi::JSValueType',
+        'js::jsapi::JS_AtomizeAndPinString',
+        'js::jsapi::JS_CallFunctionValue',
+        'js::jsapi::JS_CopyPropertiesFrom',
+        'js::jsapi::JS_DefineProperty',
+        'js::jsapi::JS_DefinePropertyById2',
+        'js::jsapi::JS_ForwardGetPropertyTo',
+        'js::jsapi::JS_GetClass',
+        'js::jsapi::JS_GetErrorPrototype',
+        'js::jsapi::JS_GetFunctionPrototype',
+        'js::jsapi::JS_GetGlobalForObject',
+        'js::jsapi::JS_GetIteratorPrototype',
+        'js::jsapi::JS_GetObjectPrototype',
+        'js::jsapi::JS_GetProperty',
+        'js::jsapi::JS_GetPropertyById',
+        'js::jsapi::JS_GetPropertyDescriptorById',
+        'js::jsapi::JS_GetReservedSlot',
+        'js::jsapi::JS_HasProperty',
+        'js::jsapi::JS_HasPropertyById',
+        'js::jsapi::JS_InitializePropertiesFromCompatibleNativeObject',
+        'js::jsapi::JS_NewObject',
+        'js::jsapi::JS_NewObjectWithGivenProto',
+        'js::jsapi::JS_NewObjectWithoutMetadata',
+        'js::jsapi::JS_SetImmutablePrototype',
+        'js::jsapi::JS_SetProperty',
+        'js::jsapi::JS_SetReservedSlot',
+        'js::jsapi::JS_SplicePrototype',
+        'js::jsapi::MutableHandle',
+        'js::jsapi::MutableHandleObject',
+        'js::jsapi::MutableHandleValue',
+        'js::jsapi::ObjectOpResult',
+        'js::jsapi::PropertyDescriptor',
+        'js::jsapi::RootedObject',
+        'js::jsapi::SymbolCode',
+        'js::jsapi::jsid',
         'js::jsval::JSVal',
-        'js::jsval::{ObjectValue, ObjectOrNullValue, PrivateValue}',
-        'js::jsval::{NullValue, UndefinedValue}',
-        'js::glue::{CallJitMethodOp, CallJitGetterOp, CallJitSetterOp, CreateProxyHandler}',
-        'js::glue::{GetProxyPrivate, NewProxyObject, ProxyTraps}',
-        'js::glue::{RUST_JSID_IS_STRING, int_to_jsid, RUST_SYMBOL_TO_JSID}',
+        'js::jsval::NullValue',
+        'js::jsval::ObjectValue',
+        'js::jsval::ObjectOrNullValue',
+        'js::jsval::PrivateValue',
+        'js::jsval::UndefinedValue',
         'js::glue::AppendToAutoIdVector',
-        'js::rust::{GCMethods, define_methods, define_properties}',
+        'js::glue::CallJitGetterOp',
+        'js::glue::CallJitMethodOp',
+        'js::glue::CallJitSetterOp',
+        'js::glue::CreateProxyHandler',
+        'js::glue::GetProxyPrivate',
+        'js::glue::NewProxyObject',
+        'js::glue::ProxyTraps',
+        'js::glue::RUST_JSID_IS_STRING',
+        'js::glue::RUST_SYMBOL_TO_JSID',
+        'js::glue::int_to_jsid',
+        'js::rust::GCMethods',
+        'js::rust::define_methods',
+        'js::rust::define_properties',
         'dom',
         'dom::bindings',
         'dom::bindings::codegen::InterfaceObjectMap',
-        'dom::bindings::global::{GlobalRef, global_root_from_object, global_root_from_reflector}',
-        'dom::bindings::interface::{ConstantSpec, InterfaceConstructorBehavior}',
-        'dom::bindings::interface::{NonCallbackInterfaceObjectClass, NonNullJSNative}',
-        'dom::bindings::interface::{create_callback_interface_object, create_global_object}',
-        'dom::bindings::interface::{create_interface_prototype_object, create_named_constructors}',
-        'dom::bindings::interface::{create_noncallback_interface_object, define_guarded_constants}',
-        'dom::bindings::interface::{define_guarded_methods, define_guarded_properties, is_exposed_in}',
-        'dom::bindings::interface::ConstantVal::{IntVal, UintVal}',
-        'dom::bindings::iterable::{IteratorType, Iterable}',
-        'dom::bindings::js::{JS, Root, RootedReference}',
-        'dom::bindings::js::{OptionalRootedReference}',
-        'dom::bindings::reflector::{Reflectable}',
-        'dom::bindings::utils::{DOMClass, DOMJSClass}',
-        'dom::bindings::utils::{DOM_PROTO_UNFORGEABLE_HOLDER_SLOT, JSCLASS_DOM_GLOBAL}',
-        'dom::bindings::utils::{ProtoOrIfaceArray, enumerate_global, finalize_global}',
-        'dom::bindings::utils::{find_enum_string_index, generic_getter, generic_lenient_getter}',
-        'dom::bindings::utils::{generic_lenient_setter, generic_method, generic_setter}',
-        'dom::bindings::utils::{get_array_index_from_id, get_dictionary_property}',
-        'dom::bindings::utils::{get_property_on_prototype, get_proto_or_iface_array}',
-        'dom::bindings::utils::{has_property_on_prototype, is_platform_object}',
-        'dom::bindings::utils::{resolve_global, set_dictionary_property, trace_global}',
-        'dom::bindings::trace::{JSTraceable, RootedTraceable}',
-        'dom::bindings::callback::{CallbackContainer,CallbackInterface,CallbackFunction}',
-        'dom::bindings::callback::{CallSetup,ExceptionHandling}',
+        'dom::bindings::global::GlobalRef',
+        'dom::bindings::global::global_root_from_object',
+        'dom::bindings::global::global_root_from_reflector',
+        'dom::bindings::interface::ConstantSpec',
+        'dom::bindings::interface::ConstantVal::IntVal',
+        'dom::bindings::interface::ConstantVal::UintVal',
+        'dom::bindings::interface::InterfaceConstructorBehavior',
+        'dom::bindings::interface::NonCallbackInterfaceObjectClass',
+        'dom::bindings::interface::NonNullJSNative',
+        'dom::bindings::interface::create_callback_interface_object',
+        'dom::bindings::interface::create_global_object',
+        'dom::bindings::interface::create_interface_prototype_object',
+        'dom::bindings::interface::create_named_constructors',
+        'dom::bindings::interface::create_noncallback_interface_object',
+        'dom::bindings::interface::define_guarded_constants',
+        'dom::bindings::interface::define_guarded_methods',
+        'dom::bindings::interface::define_guarded_properties',
+        'dom::bindings::interface::is_exposed_in',
+        'dom::bindings::iterable::Iterable',
+        'dom::bindings::iterable::IteratorType',
+        'dom::bindings::js::JS',
+        'dom::bindings::js::OptionalRootedReference',
+        'dom::bindings::js::Root',
+        'dom::bindings::js::RootedReference',
+        'dom::bindings::reflector::Reflectable',
+        'dom::bindings::utils::DOMClass',
+        'dom::bindings::utils::DOMJSClass',
+        'dom::bindings::utils::DOM_PROTO_UNFORGEABLE_HOLDER_SLOT',
+        'dom::bindings::utils::JSCLASS_DOM_GLOBAL',
+        'dom::bindings::utils::ProtoOrIfaceArray',
+        'dom::bindings::utils::enumerate_global',
+        'dom::bindings::utils::finalize_global',
+        'dom::bindings::utils::find_enum_string_index',
+        'dom::bindings::utils::generic_getter',
+        'dom::bindings::utils::generic_lenient_getter',
+        'dom::bindings::utils::generic_lenient_setter',
+        'dom::bindings::utils::generic_method',
+        'dom::bindings::utils::generic_setter',
+        'dom::bindings::utils::get_array_index_from_id',
+        'dom::bindings::utils::get_dictionary_property',
+        'dom::bindings::utils::get_property_on_prototype',
+        'dom::bindings::utils::get_proto_or_iface_array',
+        'dom::bindings::utils::has_property_on_prototype',
+        'dom::bindings::utils::is_platform_object',
+        'dom::bindings::utils::resolve_global',
+        'dom::bindings::utils::set_dictionary_property',
+        'dom::bindings::utils::trace_global',
+        'dom::bindings::trace::JSTraceable',
+        'dom::bindings::trace::RootedTraceable',
+        'dom::bindings::callback::CallSetup',
+        'dom::bindings::callback::CallbackContainer',
+        'dom::bindings::callback::CallbackInterface',
+        'dom::bindings::callback::CallbackFunction',
+        'dom::bindings::callback::ExceptionHandling',
         'dom::bindings::callback::wrap_call_this_object',
-        'dom::bindings::conversions::{ConversionBehavior, ConversionResult, DOM_OBJECT_SLOT}',
-        'dom::bindings::conversions::{IDLInterface, is_array_like}',
-        'dom::bindings::conversions::{FromJSValConvertible, StringificationBehavior}',
-        'dom::bindings::conversions::{ToJSValConvertible, jsid_to_str, native_from_handlevalue}',
-        'dom::bindings::conversions::{native_from_object, private_from_object, root_from_object}',
-        'dom::bindings::conversions::{root_from_handleobject, root_from_handlevalue}',
-        'dom::bindings::codegen::{PrototypeList, RegisterBindings, UnionTypes}',
-        'dom::bindings::error::{Fallible, Error, ErrorResult}',
+        'dom::bindings::conversions::ConversionBehavior',
+        'dom::bindings::conversions::ConversionResult',
+        'dom::bindings::conversions::DOM_OBJECT_SLOT',
+        'dom::bindings::conversions::FromJSValConvertible',
+        'dom::bindings::conversions::IDLInterface',
+        'dom::bindings::conversions::StringificationBehavior',
+        'dom::bindings::conversions::ToJSValConvertible',
+        'dom::bindings::conversions::is_array_like',
+        'dom::bindings::conversions::jsid_to_str',
+        'dom::bindings::conversions::native_from_handlevalue',
+        'dom::bindings::conversions::native_from_object',
+        'dom::bindings::conversions::private_from_object',
+        'dom::bindings::conversions::root_from_handleobject',
+        'dom::bindings::conversions::root_from_handlevalue',
+        'dom::bindings::conversions::root_from_object',
+        'dom::bindings::codegen::PrototypeList',
+        'dom::bindings::codegen::RegisterBindings',
+        'dom::bindings::codegen::UnionTypes',
+        'dom::bindings::error::Error',
+        'dom::bindings::error::ErrorResult',
+        'dom::bindings::error::Fallible',
         'dom::bindings::error::Error::JSFailed',
         'dom::bindings::error::throw_dom_exception',
-        'dom::bindings::guard::{Condition, Guard}',
+        'dom::bindings::guard::Condition',
+        'dom::bindings::guard::Guard',
         'dom::bindings::proxyhandler',
-        'dom::bindings::proxyhandler::{ensure_expando_object, fill_property_descriptor}',
-        'dom::bindings::proxyhandler::{get_expando_object, get_property_descriptor}',
+        'dom::bindings::proxyhandler::ensure_expando_object',
+        'dom::bindings::proxyhandler::fill_property_descriptor',
+        'dom::bindings::proxyhandler::get_expando_object',
+        'dom::bindings::proxyhandler::get_property_descriptor',
         'dom::bindings::num::Finite',
-        'dom::bindings::str::{ByteString, DOMString, USVString}',
-        'dom::bindings::weakref::{DOM_WEAK_SLOT, WeakBox, WeakReferenceable}',
+        'dom::bindings::str::ByteString',
+        'dom::bindings::str::DOMString',
+        'dom::bindings::str::USVString',
+        'dom::bindings::weakref::DOM_WEAK_SLOT',
+        'dom::bindings::weakref::WeakBox',
+        'dom::bindings::weakref::WeakReferenceable',
         'dom::browsingcontext::BrowsingContext',
         'mem::heap_size_of_raw_self_and_children',
         'libc',
         'util::prefs::PREFS',
-        'script_runtime::{store_panic_result, maybe_take_panic_result}',
+        'script_runtime::maybe_take_panic_result',
+        'script_runtime::store_panic_result',
         'std::borrow::ToOwned',
         'std::cmp',
         'std::mem',
         'std::num',
         'std::os',
-        'std::panic::{self, AssertUnwindSafe}',
+        'std::panic',
+        'std::panic::AssertUnwindSafe',
         'std::ptr',
         'std::str',
         'std::rc',