aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/main/servo.rs
diff options
context:
space:
mode:
authorLuqman Aden <laden@csclub.uwaterloo.ca>2014-06-10 05:10:08 -0400
committerLuqman Aden <laden@csclub.uwaterloo.ca>2014-06-10 13:00:03 -0400
commit841a6bf6475107bcf5ce39a8fd9e90de3965dce1 (patch)
treeb0172c740e26c0213c52c45176442321c0254ca2 /src/components/main/servo.rs
parent4b5fd956bda51e10e4a42e1b9640f1c541b393da (diff)
downloadservo-841a6bf6475107bcf5ce39a8fd9e90de3965dce1.tar.gz
servo-841a6bf6475107bcf5ce39a8fd9e90de3965dce1.zip
Update submodules and ~str/String, to_owned/to_string, & cast/mem to get android building.
Diffstat (limited to 'src/components/main/servo.rs')
-rw-r--r--src/components/main/servo.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index 543244de0ba..c7a2a6150b7 100644
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -142,7 +142,7 @@ fn start(argc: int, argv: **u8) -> int {
#[allow(dead_code)]
pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
native::start(argc, argv, proc() {
- let mut args: Vec<~str> = vec!();
+ let mut args: Vec<String> = vec!();
for i in range(0u, argc as uint) {
unsafe {
args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));