From dbf56c4624120a2b277a53eccecd8e86abf1ecb4 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Mon, 8 Jul 2013 22:21:20 -0600 Subject: [PATCH 1/3] Fix build flags so rust-css will compile. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 4c05472..6273fcd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,7 @@ CXX ?= g++ CXXFLAGS ?= AR ?= ar RUSTC ?= rustc -RUSTFLAGS ?= +RUSTFLAGS += -L . -L ../../netsurfcss/libcss -L ../../libparserutils/libparserutils -L ../../wapcaplet/libwapcaplet RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') From 1a6ba0b3d4340e8f7467b02be9605fb3c0453497 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Tue, 9 Jul 2013 10:32:20 -0600 Subject: [PATCH 2/3] Update tests for latest Rusts. --- color.rs | 86 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/color.rs b/color.rs index 98ced22..a515e7c 100644 --- a/color.rs +++ b/color.rs @@ -200,58 +200,58 @@ mod test { #[test] fn test_parse_by_name() { - assert!(red().eq(&parse_color(~"red").unwrap())); - assert!(lime().eq(&parse_color(~"Lime").unwrap())); - assert!(blue().eq(&parse_color(~"BLUE").unwrap())); - assert!(green().eq(&parse_color(~"GreEN").unwrap())); - assert!(white().eq(&parse_color(~"white").unwrap())); - assert!(black().eq(&parse_color(~"Black").unwrap())); - assert!(gray().eq(&parse_color(~"Gray").unwrap())); + assert!(red().eq(&parse_color("red").unwrap())); + assert!(lime().eq(&parse_color("Lime").unwrap())); + assert!(blue().eq(&parse_color("BLUE").unwrap())); + assert!(green().eq(&parse_color("GreEN").unwrap())); + assert!(white().eq(&parse_color("white").unwrap())); + assert!(black().eq(&parse_color("Black").unwrap())); + assert!(gray().eq(&parse_color("Gray").unwrap())); println("silver"); - assert!(silver().eq(&parse_color(~"SiLvEr").unwrap())); - assert!(maroon().eq(&parse_color(~"maroon").unwrap())); - assert!(purple().eq(&parse_color(~"PURPLE").unwrap())); - assert!(fuchsia().eq(&parse_color(~"FUCHSIA").unwrap())); - assert!(olive().eq(&parse_color(~"oLiVe").unwrap())); - assert!(yellow().eq(&parse_color(~"yellow").unwrap())); - assert!(navy().eq(&parse_color(~"NAVY").unwrap())); - assert!(teal().eq(&parse_color(~"Teal").unwrap())); - assert!(aqua().eq(&parse_color(~"Aqua").unwrap())); - assert!(None == parse_color(~"foobarbaz")); + assert!(silver().eq(&parse_color("SiLvEr").unwrap())); + assert!(maroon().eq(&parse_color("maroon").unwrap())); + assert!(purple().eq(&parse_color("PURPLE").unwrap())); + assert!(fuchsia().eq(&parse_color("FUCHSIA").unwrap())); + assert!(olive().eq(&parse_color("oLiVe").unwrap())); + assert!(yellow().eq(&parse_color("yellow").unwrap())); + assert!(navy().eq(&parse_color("NAVY").unwrap())); + assert!(teal().eq(&parse_color("Teal").unwrap())); + assert!(aqua().eq(&parse_color("Aqua").unwrap())); + assert!(None == parse_color("foobarbaz")); } #[test] fn test_parsing_rgb() { - assert!(red().eq(&parse_color(~"rgb(255,0,0)").unwrap())); - assert!(red().eq(&parse_color(~"rgba(255,0,0,1.0)").unwrap())); - assert!(red().eq(&parse_color(~"rgba(255,0,0,1)").unwrap())); - assert!(lime().eq(&parse_color(~"rgba(0,255,0,1.00)").unwrap())); - assert!(rgb(1u8,2u8,3u8).eq(&parse_color(~"rgb(1,2,03)").unwrap())); - assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color(~"rgba(15,250,3,.5)").unwrap())); - assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color(~"rgba(15,250,3,0.5)").unwrap())); - assert!(None == parse_color(~"rbga(1,2,3)")); + assert!(red().eq(&parse_color("rgb(255,0,0)").unwrap())); + assert!(red().eq(&parse_color("rgba(255,0,0,1.0)").unwrap())); + assert!(red().eq(&parse_color("rgba(255,0,0,1)").unwrap())); + assert!(lime().eq(&parse_color("rgba(0,255,0,1.00)").unwrap())); + assert!(rgb(1u8,2u8,3u8).eq(&parse_color("rgb(1,2,03)").unwrap())); + assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color("rgba(15,250,3,.5)").unwrap())); + assert!(rgba(15u8,250u8,3u8,0.5).eq(&parse_color("rgba(15,250,3,0.5)").unwrap())); + assert!(None == parse_color("rbga(1,2,3)")); } #[test] fn test_parsing_hsl() { - assert!(red().eq(&parse_color(~"hsl(0,1,.5)").unwrap())); - assert!(lime().eq(&parse_color(~"hsl(120.0,1.0,.5)").unwrap())); - assert!(blue().eq(&parse_color(~"hsl(240.0,1.0,.5)").unwrap())); - assert!(green().eq(&parse_color(~"hsl(120.0,1.0,.25)").unwrap())); - assert!(white().eq(&parse_color(~"hsl(1.0,1.,1.0)").unwrap())); - assert!(white().eq(&parse_color(~"hsl(129.0,0.3,1.0)").unwrap())); - assert!(black().eq(&parse_color(~"hsl(231.2,0.75,0.0)").unwrap())); - assert!(black().eq(&parse_color(~"hsl(11.2,0.0,0.0)").unwrap())); - assert!(gray().eq(&parse_color(~"hsl(0.0,0.0,0.5)").unwrap())); - assert!(maroon().eq(&parse_color(~"hsl(0.0,1.0,0.25)").unwrap())); - assert!(purple().eq(&parse_color(~"hsl(300.0,1.0,0.25)").unwrap())); - assert!(fuchsia().eq(&parse_color(~"hsl(300,1.0,0.5)").unwrap())); - assert!(olive().eq(&parse_color(~"hsl(60.,1.0,0.25)").unwrap())); - assert!(yellow().eq(&parse_color(~"hsl(60.,1.0,0.5)").unwrap())); - assert!(navy().eq(&parse_color(~"hsl(240.0,1.0,.25)").unwrap())); - assert!(teal().eq(&parse_color(~"hsl(180.0,1.0,.25)").unwrap())); - assert!(aqua().eq(&parse_color(~"hsl(180.0,1.0,.5)").unwrap())); - assert!(None == parse_color(~"hsl(1,2,3,.4)")); + assert!(red().eq(&parse_color("hsl(0,1,.5)").unwrap())); + assert!(lime().eq(&parse_color("hsl(120.0,1.0,.5)").unwrap())); + assert!(blue().eq(&parse_color("hsl(240.0,1.0,.5)").unwrap())); + assert!(green().eq(&parse_color("hsl(120.0,1.0,.25)").unwrap())); + assert!(white().eq(&parse_color("hsl(1.0,1.,1.0)").unwrap())); + assert!(white().eq(&parse_color("hsl(129.0,0.3,1.0)").unwrap())); + assert!(black().eq(&parse_color("hsl(231.2,0.75,0.0)").unwrap())); + assert!(black().eq(&parse_color("hsl(11.2,0.0,0.0)").unwrap())); + assert!(gray().eq(&parse_color("hsl(0.0,0.0,0.5)").unwrap())); + assert!(maroon().eq(&parse_color("hsl(0.0,1.0,0.25)").unwrap())); + assert!(purple().eq(&parse_color("hsl(300.0,1.0,0.25)").unwrap())); + assert!(fuchsia().eq(&parse_color("hsl(300,1.0,0.5)").unwrap())); + assert!(olive().eq(&parse_color("hsl(60.,1.0,0.25)").unwrap())); + assert!(yellow().eq(&parse_color("hsl(60.,1.0,0.5)").unwrap())); + assert!(navy().eq(&parse_color("hsl(240.0,1.0,.25)").unwrap())); + assert!(teal().eq(&parse_color("hsl(180.0,1.0,.25)").unwrap())); + assert!(aqua().eq(&parse_color("hsl(180.0,1.0,.5)").unwrap())); + assert!(None == parse_color("hsl(1,2,3,.4)")); } } From 45018d07a65c099dfa0c5a1dd5fa698c501483eb Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Tue, 9 Jul 2013 13:33:08 -0600 Subject: [PATCH 3/3] Work around compiler bug. --- test.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test.rs b/test.rs index a15c814..e0fcd9b 100644 --- a/test.rs +++ b/test.rs @@ -108,15 +108,15 @@ impl SelectHandler for TestHandler { fn single_div_test(style: &str, f: &fn(&ComputedStyle)) { let sheet = Stylesheet::new(test_url(), style_stream(style)); let mut select_ctx = SelectCtx::new(); - let handler = &TestHandler::new(); + let handler = TestHandler::new(); select_ctx.append_sheet(sheet, OriginAuthor); - let dom = &TestNode(@NodeData { + let dom = TestNode(@NodeData { name: ~"div", id: ~"id1", children: ~[], parent: @mut None }); - let style = select_ctx.select_style(dom, handler); + let style = select_ctx.select_style(&dom, &handler); let computed = style.computed_style(); f(&computed); } @@ -124,15 +124,15 @@ fn single_div_test(style: &str, f: &fn(&ComputedStyle)) { fn single_html_test(style: &str, f: &fn(&ComputedStyle)) { let sheet = Stylesheet::new(test_url(), style_stream(style)); let mut select_ctx = SelectCtx::new(); - let handler = &TestHandler::new(); + let handler = TestHandler::new(); select_ctx.append_sheet(sheet, OriginAuthor); - let dom = &TestNode(@NodeData { + let dom = TestNode(@NodeData { name: ~"html", id: ~"id1", children: ~[], parent: @mut None }); - let style = select_ctx.select_style(dom, handler); + let style = select_ctx.select_style(&dom, &handler); let computed = style.computed_style(); f(&computed); }