servo: Merge #5777 - Make Attr::prefix an Atom (from tamird:ICE-attr-…

…prefix-atom); r=jdm

Rebase of https://github.com/Ms2ger/servo/commits/ICE-attr-prefix-atom

Some of the changes weren't necessary since the internals had been refactored some in the interim. In any case, I was unable to reproduce the ICE reported in rust-lang/rust#18957.

Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: b0a7d1bf865eff7b6ca3bae874004a61c19b3c27

UltraBlame original commit: 4af16b10e9d304b2651a66dcca09f497c38fa55d

servo/components/script/dom/attr.rs

@@ -767,7 +767,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 /
 /
@@ -811,7 +811,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 owner
 :
@@ -903,7 +903,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 owner
 :
@@ -1032,7 +1032,7 @@ self
 a
 Option
 <
-DOMString
+Atom
 >
 {
 &
@@ -1538,10 +1538,28 @@ DOMString
 self
 .
 prefix
+(
+)
 .
-clone
+as_ref
 (
 )
+.
+map
+(
+|
+p
+|
+(
+*
+*
+p
+)
+.
+to_owned
+(
+)
+)
 }
 /
 /

servo/components/script/dom/bindings/utils.rs

@@ -196,15 +196,6 @@ use
 std
 :
 :
-borrow
-:
-:
-ToOwned
-;
-use
-std
-:
-:
 boxed
 ;
 use
@@ -4591,7 +4582,7 @@ Fallible
 Namespace
 Option
 <
-DOMString
+Atom
 >
 Atom
 )
@@ -4913,14 +4904,10 @@ p
 .
 map
 (
-|
-s
-|
-s
-.
-to_owned
-(
-)
+Atom
+:
+:
+from_slice
 )
 Atom
 :

servo/components/script/dom/create.rs

@@ -726,19 +726,13 @@ htmlvideoelement
 HTMLVideoElement
 ;
 use
-util
-:
-:
-str
-:
-:
-DOMString
-;
-use
 string_cache
 :
 :
+{
+Atom
 QualName
+}
 ;
 use
 std
@@ -760,7 +754,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 document
 :
@@ -779,6 +773,26 @@ Temporary
 Element
 >
 {
+let
+prefix
+=
+prefix
+.
+map
+(
+|
+p
+|
+(
+*
+p
+)
+.
+to_owned
+(
+)
+)
+;
 if
 name
 .

servo/components/script/dom/element.rs

@@ -1143,7 +1143,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 document
 :
@@ -5413,7 +5413,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 )
 ;
@@ -5468,7 +5468,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 cb
 :
@@ -6242,7 +6242,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 )
 {
@@ -6366,6 +6366,8 @@ format
 {
 }
 "
+&
+*
 *
 prefix
 &
@@ -6686,7 +6688,7 @@ prefix
 :
 Option
 <
-DOMString
+Atom
 >
 cb
 :
@@ -9447,18 +9449,6 @@ clone
 (
 )
 prefix
-.
-map
-(
-|
-s
-|
-s
-.
-to_owned
-(
-)
-)
 |
 attr
 |

servo/components/script/dom/node.rs

@@ -875,7 +875,10 @@ use
 string_cache
 :
 :
+{
+Atom
 QualName
+}
 ;
 /
 /
@@ -12621,15 +12624,14 @@ map
 |
 p
 |
+Atom
+:
+:
+from_slice
 (
-*
-*
+&
 p
 )
-.
-to_owned
-(
-)
 )
 document
 .