From 56c0b1a7bc1a709ab917e1f368117e0aded94a4a Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 30 Jan 2013 14:34:47 -0800
Subject: [PATCH] Upgrade Rust and pixman

---
 src/pixman                        | 2 +-
 src/rust-azure                    | 2 +-
 src/rust-cocoa                    | 2 +-
 src/rust-core-foundation          | 2 +-
 src/rust-core-graphics            | 2 +-
 src/rust-core-text                | 2 +-
 src/rust-io-surface               | 2 +-
 src/servo-gfx/quartz/font_list.rs | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pixman b/src/pixman
index a5e5179b562..958bd334b3c 160000
--- a/src/pixman
+++ b/src/pixman
@@ -1 +1 @@
-Subproject commit a5e5179b5624c99c812e9bf6e7b907e355a811e8
+Subproject commit 958bd334b3c17f529c80f2eeef4224f45c62f292
diff --git a/src/rust-azure b/src/rust-azure
index a8bdb2f58bf..8c20ce62b37 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit a8bdb2f58bf415deb5a1bf1407f17bcd09f2d965
+Subproject commit 8c20ce62b372db2015856ec7ef7d5da36da705f7
diff --git a/src/rust-cocoa b/src/rust-cocoa
index b108b2b8d4a..c6dc3d8b0a3 160000
--- a/src/rust-cocoa
+++ b/src/rust-cocoa
@@ -1 +1 @@
-Subproject commit b108b2b8d4a53ef1d9720dfc484b971d19f9817d
+Subproject commit c6dc3d8b0a3b94b7134213a4d01599484d4a8927
diff --git a/src/rust-core-foundation b/src/rust-core-foundation
index ea2221e1ffc..990b2751019 160000
--- a/src/rust-core-foundation
+++ b/src/rust-core-foundation
@@ -1 +1 @@
-Subproject commit ea2221e1ffcce397a0b742159a7f3def05ece039
+Subproject commit 990b2751019a750d23d22ad777fe54d786aa1ce8
diff --git a/src/rust-core-graphics b/src/rust-core-graphics
index fb1ea4368fd..4ef941f09e5 160000
--- a/src/rust-core-graphics
+++ b/src/rust-core-graphics
@@ -1 +1 @@
-Subproject commit fb1ea4368fd766239bd3578d66c4218fa46f1e5e
+Subproject commit 4ef941f09e58c122c96f15cecc7bd97e145bed01
diff --git a/src/rust-core-text b/src/rust-core-text
index 6e163d5bab3..d54ba38e73e 160000
--- a/src/rust-core-text
+++ b/src/rust-core-text
@@ -1 +1 @@
-Subproject commit 6e163d5bab3bef6cebe7660867388da5a8681b9f
+Subproject commit d54ba38e73e2d46f713cf148a44a829d41db44bd
diff --git a/src/rust-io-surface b/src/rust-io-surface
index fbcc1ad6d7b..58fb6a2570e 160000
--- a/src/rust-io-surface
+++ b/src/rust-io-surface
@@ -1 +1 @@
-Subproject commit fbcc1ad6d7b44a19e99e70f5ab6e04f951f7811f
+Subproject commit 58fb6a2570eabc2de73727bc022e3247c99e5bba
diff --git a/src/servo-gfx/quartz/font_list.rs b/src/servo-gfx/quartz/font_list.rs
index ccbb2a406e9..d05be53c8f3 100644
--- a/src/servo-gfx/quartz/font_list.rs
+++ b/src/servo-gfx/quartz/font_list.rs
@@ -18,7 +18,7 @@ use gfx_font::FontHandle;
 use gfx_font_list::{FontEntry, FontFamily, FontFamilyMap};
 
 use core::dvec::DVec;
-use core::send_map::{linear, SendMap};
+use core::hashmap::linear::LinearMap;
 
 pub struct QuartzFontListHandle {
     fctx: QuartzFontContextHandle,
@@ -31,7 +31,7 @@ pub impl QuartzFontListHandle {
 
     fn get_available_families() -> FontFamilyMap {
         let family_names = quartz::font_list::core_text::font_collection::get_family_names();
-        let mut family_map : FontFamilyMap = linear::LinearMap();
+        let mut family_map : FontFamilyMap = LinearMap::new();
         for family_names.each |strref: &CFStringRef| {
             let family_name = CFWrapper::wrap_shared(*strref).to_str();
             debug!("Creating new FontFamily for family: %s", family_name);