Skip to content
This repository was archived by the owner on Jul 10, 2023. It is now read-only.

Commit f385f19

Browse files
committed
Merge pull request #39 from metajack/uprust
Upgrade Rust.
2 parents 13cf077 + 9ffe8bb commit f385f19

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

color.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub fn hsl(h : f64, s : f64, l : f64) -> Color {
8181
impl Color {
8282
fn print(&self) -> ~str {
8383
fmt!("rgba(%u,%u,%u,%f)", self.red as uint, self.green as uint,
84-
self.blue as uint, self.alpha as float)
84+
self.blue as uint, self.alpha as f64)
8585
}
8686
}
8787

css.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Basic operation:
1616
* Resolve inheritance for computed styles by (not implemented)
1717

1818
*/
19+
#[feature(globs)];
20+
#[feature(macro_rules)];
1921

2022
#[link(name = "css",
2123
vers = "0.1")];

select.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl<N, H: SelectHandler<N>> n::s::CssSelectHandler<N> for SelectHandlerWrapper<
130130
fn node_classes(&self, node: &N) -> Option<~[LwcString]> {
131131
do self.inner_ref().with_node_classes(node) |node_classes_opt| {
132132
do node_classes_opt.map |s| {
133-
debug!("SelectHandlerWrapper::node_classes - classes: %?", *s);
133+
debug!("SelectHandlerWrapper::node_classes - classes: %s", s);
134134
let mut v = ~[];
135135
for t in s.split_iter(' ') {
136136
debug!("SelectHandlerWrapper::node_classes - class: %?", t);
@@ -144,7 +144,7 @@ impl<N, H: SelectHandler<N>> n::s::CssSelectHandler<N> for SelectHandlerWrapper<
144144

145145
fn node_id(&self, node: &N) -> Option<LwcString> {
146146
do self.inner_ref().with_node_id(node) |node_id_opt| {
147-
node_id_opt.map(|s| lwcstr_from_rust_str(*s))
147+
node_id_opt.map(|s| lwcstr_from_rust_str(s))
148148
}
149149
}
150150

0 commit comments

Comments
 (0)