aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/utils.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-08 08:00:57 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-08 08:00:57 -0700
commit1d7148c79f9124779a910fd5291c5fa0543b2dae (patch)
tree39c86574fa33821af51560fb6991911328bdf4e2 /components/script/dom/bindings/utils.rs
parent19cb0fa9e457c18b36944c2691c7491ee6eb9cd2 (diff)
parent16c7060bc8ff91527ae97f8a3feee5706747b9c5 (diff)
downloadservo-1d7148c79f9124779a910fd5291c5fa0543b2dae.tar.gz
servo-1d7148c79f9124779a910fd5291c5fa0543b2dae.zip
auto merge of #4554 : servo/servo/rustup_20141221, r=jdm
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r--components/script/dom/bindings/utils.rs32
1 files changed, 17 insertions, 15 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index ec809144374..6986ddaf344 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -129,6 +129,7 @@ pub struct NativePropertyHooks {
}
/// The struct that holds inheritance information for DOM object reflectors.
+#[deriving(Copy)]
pub struct DOMClass {
/// A list of interfaces that this object implements, in order of decreasing
/// derivedness.
@@ -139,6 +140,7 @@ pub struct DOMClass {
}
/// The JSClass used for DOM object reflectors.
+#[deriving(Copy)]
pub struct DOMJSClass {
/// The actual JSClass.
pub base: js::Class,
@@ -586,18 +588,18 @@ pub fn xml_name_type(name: &str) -> XMLName {
'A' ... 'Z' |
'_' |
'a' ... 'z' |
- '\u00C0' ... '\u00D6' |
- '\u00D8' ... '\u00F6' |
- '\u00F8' ... '\u02FF' |
- '\u0370' ... '\u037D' |
- '\u037F' ... '\u1FFF' |
- '\u200C' ... '\u200D' |
- '\u2070' ... '\u218F' |
- '\u2C00' ... '\u2FEF' |
- '\u3001' ... '\uD7FF' |
- '\uF900' ... '\uFDCF' |
- '\uFDF0' ... '\uFFFD' |
- '\U00010000' ... '\U000EFFFF' => true,
+ '\u{C0}' ... '\u{D6}' |
+ '\u{D8}' ... '\u{F6}' |
+ '\u{F8}' ... '\u{2FF}' |
+ '\u{370}' ... '\u{37D}' |
+ '\u{37F}' ... '\u{1FFF}' |
+ '\u{200C}' ... '\u{200D}' |
+ '\u{2070}' ... '\u{218F}' |
+ '\u{2C00}' ... '\u{2FEF}' |
+ '\u{3001}' ... '\u{D7FF}' |
+ '\u{F900}' ... '\u{FDCF}' |
+ '\u{FDF0}' ... '\u{FFFD}' |
+ '\u{10000}' ... '\u{EFFFF}' => true,
_ => false,
}
}
@@ -607,9 +609,9 @@ pub fn xml_name_type(name: &str) -> XMLName {
'-' |
'.' |
'0' ... '9' |
- '\u00B7' |
- '\u0300' ... '\u036F' |
- '\u203F' ... '\u2040' => true,
+ '\u{B7}' |
+ '\u{300}' ... '\u{36F}' |
+ '\u{203F}' ... '\u{2040}' => true,
_ => false,
}
}