ch2: Refactor

Author: corona10

rust/src/main.rs

@@ -23,21 +23,15 @@ struct BrowserWidget {
     max_scroll: i32,
 }
 
-trait Browser {
-    fn load(&mut self, url: String);
-}
-
-struct BrowserApplication {}
-
-impl Browser for BrowserWidget {
-    fn load(&mut self, url: String) {
-        let (_headers, body) = request(&url);
-        let text = lex(&body);
+impl BrowserWidget {
+    fn new(text: String) -> BrowserWidget {
         let mut cursor_x = HSTEP;
         let mut cursor_y = VSTEP;
+        let mut max_scroll = 0;
+        let mut display_list = Vec::new();
         for c in text.chars() {
-            self.max_scroll = cmp::max(self.max_scroll, cursor_y);
-            self.display_list.push(Character {
+            max_scroll = cmp::max(max_scroll, cursor_y);
+            display_list.push(Character {
                 x: cursor_x,
                 y: cursor_y,
                 ch: c,
@@ -48,6 +42,12 @@ impl Browser for BrowserWidget {
                 cursor_x = HSTEP;
             }
         }
+        BrowserWidget {
+            display_list: display_list,
+            scroll: 0,
+            min_scroll: 0,
+            max_scroll: max_scroll,
+        }
     }
 }
 
@@ -112,18 +112,13 @@ impl Widget<i32> for BrowserWidget {
     }
 }
 
+struct BrowserApplication {}
+
 impl BrowserApplication {
-    fn run(&self, url: String) {
-        let browser_widget = || -> BrowserWidget {
-            let mut ret = BrowserWidget {
-                display_list: Vec::new(),
-                scroll: 0,
-                min_scroll: 0,
-                max_scroll: 0,
-            };
-            ret.load(url);
-            ret
-        };
+    fn run(&self, url: &str) {
+        let (_headers, body) = request(&url);
+        let text = lex(&body);
+        let browser_widget = || -> BrowserWidget { BrowserWidget::new(text) };
         let window = WindowDesc::new(browser_widget)
             .title(LocalizedString::new("Browser-engineering"))
             .window_size((WIDTH as f64, HEIGHT as f64));
@@ -137,5 +132,5 @@ impl BrowserApplication {
 pub fn main() {
     let args: Vec<String> = std::env::args().collect();
     let app = BrowserApplication {};
-    app.run(args[1].clone());
+    app.run(&args[1]);
 }