Permalink
Browse files

Fixed compilation errors from keyword changes

  • Loading branch information...
mmeyerho committed Aug 2, 2012
1 parent fa122b2 commit b9b68a72b7dd6b035a5458b3b4c27059fc3ea19d
Showing with 9 additions and 9 deletions.
  1. +1 −1 src/rust-mozjs
  2. +1 −1 src/rust-opengles
  3. +1 −1 src/servo/gfx/renderer.rs
  4. +4 −4 src/servo/opts.rs
  5. +2 −2 src/servo/util/tree.rs
Submodule rust-mozjs updated 1 files
+1 −1 jsapi.rs
Submodule rust-opengles updated 1 files
+2 −2 gl2.rs
@@ -30,7 +30,7 @@ each rendered frame and submit them to be drawn to the display
FIXME: Change this name to Compositor.
"]
-iface Sink {
+trait Sink {
fn begin_drawing(+next_dt: pipes::chan<AzDrawTargetRef>);
fn draw(+next_dt: pipes::chan<AzDrawTargetRef>, draw_me: AzDrawTargetRef);
fn add_event_listener(listener: comm::chan<Event>);
View
@@ -25,18 +25,18 @@ fn from_cmdline_args(args: ~[~str]) -> Opts {
getopts::optopt(~"o")
];
- let match = alt getopts::getopts(args, opts) {
+ let opt_match = alt getopts::getopts(args, opts) {
result::ok(m) { copy m }
result::err(f) { fail getopts::fail_str(f) }
};
- let urls = if match.free.is_empty() {
+ let urls = if opt_match.free.is_empty() {
fail ~"servo asks that you provide 1 or more URLs"
} else {
- copy match.free
+ copy opt_match.free
};
- let render_mode = alt getopts::opt_maybe_str(match, ~"o") {
+ let render_mode = alt getopts::opt_maybe_str(opt_match, ~"o") {
some(output_file) { Png(copy output_file) }
none { Screen }
};
View
@@ -10,11 +10,11 @@ type Tree<T> = {
mut next_sibling: option<T>
};
-iface ReadMethods<T> {
+trait ReadMethods<T> {
fn with_tree_fields<R>(T, f: fn(Tree<T>) -> R) -> R;
}
-iface WriteMethods<T> {
+trait WriteMethods<T> {
fn with_tree_fields<R>(T, f: fn(Tree<T>) -> R) -> R;
}

0 comments on commit b9b68a7

Please sign in to comment.