Resolves long-running merge conflicts

components/script/dom/element.rs

@@ -1095,7 +1095,7 @@ impl Element {
         assert!(local_name.chars().all(|ch| {
             !ch.is_ascii() || ch.to_ascii_lowercase() == ch
         }));
-        let attribute = self.get_attribute(&ns!(""), local_name);
+        let attribute = self.get_attribute(&ns!(), local_name);
 
         match attribute {
             Some(ref attribute) => {

components/script/dom/macros.rs

@@ -28,21 +28,18 @@ macro_rules! make_bool_getter(
 
 #[macro_export]
 macro_rules! make_int_getter(
-    ($attr:ident, $htmlname:expr, $default:expr) => (
+    ($attr:ident, $htmlname:tt, $default:expr) => (
         fn $attr(&self) -> i32 {
-            use dom::bindings::codegen::InheritTypes::ElementCast;
-            use string_cache::Atom;
-            let element = ElementCast::from_ref(self);
-            // FIXME(pcwalton): Do this at compile time, not runtime.
-            element.get_int_attribute(&Atom::from_slice($htmlname), $default)
+            use dom::bindings::inheritance::Castable;
+            use dom::element::Element;
+            let element = self.upcast::<Element>();
+            element.get_int_attribute(&atom!($htmlname), $default)
         }
     );
-    ($attr:ident, $htmlname:expr) => {
+
+    ($attr:ident, $htmlname:tt) => {
         make_int_getter!($attr, $htmlname, 0);
     };
-    ($attr:ident) => {
-        make_int_getter!($attr, to_lower!(stringify!($attr)));
-    }
 );
 
 #[macro_export]

tests/unit/script/textinput.rs

@@ -23,11 +23,11 @@ fn text_input(lines: Lines, s: &str) -> TextInput<DummyClipboardContext> {
 #[test]
 fn test_set_content_ignores_max_length() {
     let mut textinput = TextInput::new(
-        Lines::Single, "".to_owned(), DummyClipboardContext::new(""), Some(1)
+        Lines::Single, DOMString::from(""), DummyClipboardContext::new(""), Some(1)
     );
 
-    textinput.set_content("mozilla rocks".to_owned());
-    assert_eq!(textinput.get_content(), "mozilla rocks".to_owned());
+    textinput.set_content(DOMString::from("mozilla rocks"));
+    assert_eq!(textinput.get_content(), DOMString::from("mozilla rocks"));
 }
 
 #[test]