From 8dc5398ad65ab5fc0ea8f739f101bfd3bca5dd95 Mon Sep 17 00:00:00 2001 From: Eric Holk Date: Fri, 17 Aug 2012 16:06:06 -0700 Subject: [PATCH] class -> strucT --- src/servo/content.rs | 4 ++-- src/servo/dom/base.rs | 4 ++-- src/servo/dom/rcu.rs | 2 +- src/servo/engine.rs | 2 +- src/servo/layout/base.rs | 8 ++++---- src/servo/resource/resource_task.rs | 2 +- src/servo/text/font.rs | 4 +--- src/servo/text/font_library.rs | 2 +- src/servo/text/glyph.rs | 4 ++-- src/servo/text/native_font/ft_native_font.rs | 2 +- src/servo/text/native_font/quartz_native_font.rs | 2 +- src/servo/text/text_run.rs | 2 +- 12 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/servo/content.rs b/src/servo/content.rs index a8176a0e12d..673db24e9cc 100644 --- a/src/servo/content.rs +++ b/src/servo/content.rs @@ -64,7 +64,7 @@ fn join_layout(scope: NodeScope, layout: Layout) { } } -class Document { +struct Document { let root: Node; let css_rules: arc; @@ -74,7 +74,7 @@ class Document { } } -class Content { +struct Content { let sink: S; let layout: Layout; let from_master: comm::Port; diff --git a/src/servo/dom/base.rs b/src/servo/dom/base.rs index 37e1fd5fd05..786eec7189f 100644 --- a/src/servo/dom/base.rs +++ b/src/servo/dom/base.rs @@ -24,7 +24,7 @@ enum NodeKind { Text(~str) } -class ElementData { +struct ElementData { let tag_name: ~str; let kind: ~ElementKind; let attrs: DVec<~Attr>; @@ -48,7 +48,7 @@ class ElementData { } } -class Attr { +struct Attr { let name: ~str; let value: ~str; diff --git a/src/servo/dom/rcu.rs b/src/servo/dom/rcu.rs index 804c27d0bc9..9a81c92423f 100644 --- a/src/servo/dom/rcu.rs +++ b/src/servo/dom/rcu.rs @@ -64,7 +64,7 @@ type ScopeData = { mut first_dirty: Handle }; -class ScopeResource { +struct ScopeResource { let d : ScopeData; new(-d : ScopeData) { self.d = d; diff --git a/src/servo/engine.rs b/src/servo/engine.rs index 0b1642597c2..91ce3e5cfad 100644 --- a/src/servo/engine.rs +++ b/src/servo/engine.rs @@ -12,7 +12,7 @@ import image_cache_task::{ImageCacheTask, image_cache_task, ImageCacheTaskClient import pipes::{port, chan}; -class Engine { +struct Engine { let sink: S; let renderer: Renderer; diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs index c87d4d92fcc..495bdc48c42 100644 --- a/src/servo/layout/base.rs +++ b/src/servo/layout/base.rs @@ -29,7 +29,7 @@ enum BoxKind { TextBoxKind(@TextBox) } -class Appearance { +struct Appearance { let mut background_image: option; let mut background_color: Color; let mut width: Unit; @@ -62,7 +62,7 @@ class Appearance { } } -class Box { +struct Box { let tree: tree::Tree<@Box>; let node: Node; let kind: BoxKind; @@ -78,10 +78,10 @@ class Box { } } -#[doc="A class to store image data. The image will be loaded once, +#[doc="A struct to store image data. The image will be loaded once, the first time it is requested, and an arc will be stored. Clones of this arc are given out on demand."] -class ImageHolder { +struct ImageHolder { // Invariant: at least one of url and image is not none, except // occasionally while get_image is being called let mut url : option; diff --git a/src/servo/resource/resource_task.rs b/src/servo/resource/resource_task.rs index 735bff992d2..5beb43838b7 100644 --- a/src/servo/resource/resource_task.rs +++ b/src/servo/resource/resource_task.rs @@ -55,7 +55,7 @@ fn create_resource_task_with_loaders(+loaders: ~[(~str, LoaderTaskFactory)]) -> } } -class ResourceManager { +struct ResourceManager { let from_client: Port; /// Per-scheme resource loaders let loaders: ~[(~str, LoaderTaskFactory)]; diff --git a/src/servo/text/font.rs b/src/servo/text/font.rs index c94cf34b1f5..d1e1baf9616 100644 --- a/src/servo/text/font.rs +++ b/src/servo/text/font.rs @@ -7,13 +7,11 @@ import ptr::{ null, addr_of }; import native_font::NativeFont; import font_library::FontLibrary; -// FIXME (rust 2708): convert this to a class - #[doc = " A font handle. Layout can use this to calculate glyph metrics and the renderer can use it to render text. "] -class Font { +struct Font { let fontbuf: @~[u8]; let native_font: NativeFont; diff --git a/src/servo/text/font_library.rs b/src/servo/text/font_library.rs index 5986b846584..72f599c4af3 100644 --- a/src/servo/text/font_library.rs +++ b/src/servo/text/font_library.rs @@ -3,7 +3,7 @@ export FontLibrary, native; import font::{Font, test_font_bin}; import result::{result, ok, err}; -class FontLibrary { +struct FontLibrary { let native_lib: native::NativeFontLibrary; new() { diff --git a/src/servo/text/glyph.rs b/src/servo/text/glyph.rs index f50907d030a..4d87280a56f 100644 --- a/src/servo/text/glyph.rs +++ b/src/servo/text/glyph.rs @@ -7,7 +7,7 @@ import geom::point::Point2D; type GlyphIndex = uint; #[doc="The position of a glyph on the screen."] -class GlyphPos { +struct GlyphPos { let advance: Point2D; let offset: Point2D; new(advance: Point2D, offset: Point2D) { @@ -17,7 +17,7 @@ class GlyphPos { } #[doc="A single glyph."] -class Glyph { +struct Glyph { let index: GlyphIndex; let pos: GlyphPos; diff --git a/src/servo/text/native_font/ft_native_font.rs b/src/servo/text/native_font/ft_native_font.rs index a1b4c077014..38701f85783 100644 --- a/src/servo/text/native_font/ft_native_font.rs +++ b/src/servo/text/native_font/ft_native_font.rs @@ -17,7 +17,7 @@ import freetype::bindgen::{ FT_Set_Char_Size }; -class FreeTypeNativeFont/& { +struct FreeTypeNativeFont/& { let face: FT_Face; new(face: FT_Face) { diff --git a/src/servo/text/native_font/quartz_native_font.rs b/src/servo/text/native_font/quartz_native_font.rs index 91b37066050..8cced608188 100644 --- a/src/servo/text/native_font/quartz_native_font.rs +++ b/src/servo/text/native_font/quartz_native_font.rs @@ -18,7 +18,7 @@ import cocoa::cg::cg::{ CGFontRelease }; -class QuartzNativeFont/& { +struct QuartzNativeFont/& { let fontprov: CGDataProviderRef; let cgfont: CGFontRef; diff --git a/src/servo/text/text_run.rs b/src/servo/text/text_run.rs index 082defa5d6b..30a2b81466b 100644 --- a/src/servo/text/text_run.rs +++ b/src/servo/text/text_run.rs @@ -8,7 +8,7 @@ import glyph::Glyph; import shaper::shape_text; #[doc="A single, unbroken line of text."] -class TextRun { +struct TextRun { let glyphs: ~[Glyph]; new(font: Font, text: ~str) {