From 0b9dfde34972f0b3a4ec1bdcc1141a376bcbf250 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 30 Oct 2012 15:58:26 -0700
Subject: [PATCH] Flatten the css module

---
 src/servo/css/{resolve => }/apply.rs    | 0
 src/servo/css/{resolve => }/matching.rs | 0
 src/servo/css/styles.rs                 | 2 +-
 src/servo/servo.rc                      | 6 ++----
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename src/servo/css/{resolve => }/apply.rs (100%)
 rename src/servo/css/{resolve => }/matching.rs (100%)

diff --git a/src/servo/css/resolve/apply.rs b/src/servo/css/apply.rs
similarity index 100%
rename from src/servo/css/resolve/apply.rs
rename to src/servo/css/apply.rs
diff --git a/src/servo/css/resolve/matching.rs b/src/servo/css/matching.rs
similarity index 100%
rename from src/servo/css/resolve/matching.rs
rename to src/servo/css/matching.rs
diff --git a/src/servo/css/styles.rs b/src/servo/css/styles.rs
index af2ec6368db..fcc19880a02 100644
--- a/src/servo/css/styles.rs
+++ b/src/servo/css/styles.rs
@@ -174,5 +174,5 @@ impl Node : StyleMethods {
 }
 
 fn apply_style(layout_ctx: &LayoutContext, node: Node) {
-    resolve::apply::apply_style(layout_ctx, node)
+    apply::apply_style(layout_ctx, node)
 }
\ No newline at end of file
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index 409177134ec..83ea5429f63 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -46,10 +46,8 @@ pub mod content {
 
 pub mod css {
     pub mod styles;
-    mod resolve {
-        pub mod apply;
-        mod matching;
-    }
+    mod apply;
+    mod matching;
 }
 
 pub mod layout {