aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/util/str.rs
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2014-06-01 00:21:53 -0600
committerJack Moffitt <jack@metajack.im>2014-06-05 09:58:59 -0600
commit629c4c6afe7cea86c051bb9f52adeac716e2c43f (patch)
treeee84d9a9b37ecd37e0a9606509624e7f728f5a81 /src/components/util/str.rs
parent2ae671b5aa9d27812adcdb8ebc749733156df66e (diff)
downloadservo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.tar.gz
servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.zip
Upgrade Rust.
Diffstat (limited to 'src/components/util/str.rs')
-rw-r--r--src/components/util/str.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/util/str.rs b/src/components/util/str.rs
index f9e21a97260..28412dd55e7 100644
--- a/src/components/util/str.rs
+++ b/src/components/util/str.rs
@@ -5,7 +5,7 @@
use std::iter::Filter;
use std::str::CharSplits;
-pub type DOMString = ~str;
+pub type DOMString = String;
pub type StaticCharVec = &'static [char];
pub type StaticStringVec = &'static [&'static str];
@@ -13,7 +13,7 @@ pub fn null_str_as_empty(s: &Option<DOMString>) -> DOMString {
// We don't use map_default because it would allocate "".to_owned() even for Some.
match *s {
Some(ref s) => s.clone(),
- None => "".to_owned()
+ None => "".to_string()
}
}