Skip to content

Commit

Permalink
Add rustfmt.toml
Browse files Browse the repository at this point in the history
And run cargo fmt over repo.
  • Loading branch information
Rob Tsuk committed May 18, 2018
1 parent aa44dcd commit c5b27c8
Show file tree
Hide file tree
Showing 9 changed files with 308 additions and 119 deletions.
43 changes: 37 additions & 6 deletions benches/raster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,48 @@
// limitations under the License.

#![feature(test)]
extern crate test;
extern crate font_rs;
extern crate test;

use test::Bencher;
use font_rs::raster::*;
use font_rs::geom::Point;
use font_rs::raster::*;
use test::Bencher;

fn draw_shape(r: &mut Raster, s: f32) {
r.draw_line(&Point{x:s*10.0, y:s*10.5}, &Point{x: s*20.0, y: s*150.0});
r.draw_line(&Point{x:s*20.0, y:s*150.0}, &Point{x: s*50.0, y: s*139.0});
r.draw_quad(&Point{x:s*50.0, y:s*139.0}, &Point{x: s*100.0, y: s*60.0}, &Point{x: s*10.0, y: s*10.5});
r.draw_line(
&Point {
x: s * 10.0,
y: s * 10.5,
},
&Point {
x: s * 20.0,
y: s * 150.0,
},
);
r.draw_line(
&Point {
x: s * 20.0,
y: s * 150.0,
},
&Point {
x: s * 50.0,
y: s * 139.0,
},
);
r.draw_quad(
&Point {
x: s * 50.0,
y: s * 139.0,
},
&Point {
x: s * 100.0,
y: s * 60.0,
},
&Point {
x: s * 10.0,
y: s * 10.5,
},
);
}

#[bench]
Expand Down
8 changes: 4 additions & 4 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ extern crate gcc;

fn main() {
gcc::Build::new()
.file("src/accumulate.c")
.flag("-march=native")
.flag("-std=c99")
.compile("libaccumulate.a");
.file("src/accumulate.c")
.flag("-march=native")
.flag("-std=c99")
.compile("libaccumulate.a");
}
39 changes: 35 additions & 4 deletions examples/draw_shape.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,44 @@ extern crate font_rs;

use std::io::{stdout, Write};

use font_rs::raster::Raster;
use font_rs::geom::Point;
use font_rs::raster::Raster;

fn draw_shape(r: &mut Raster, s: f32) {
r.draw_line(&Point{x:s*10.0, y:s*10.5}, &Point{x: s*20.0, y: s*150.0});
r.draw_line(&Point{x:s*20.0, y:s*150.0}, &Point{x: s*50.0, y: s*139.0});
r.draw_quad(&Point{x:s*50.0, y:s*139.0}, &Point{x: s*100.0, y: s*60.0}, &Point{x: s*10.0, y: s*10.5});
r.draw_line(
&Point {
x: s * 10.0,
y: s * 10.5,
},
&Point {
x: s * 20.0,
y: s * 150.0,
},
);
r.draw_line(
&Point {
x: s * 20.0,
y: s * 150.0,
},
&Point {
x: s * 50.0,
y: s * 139.0,
},
);
r.draw_quad(
&Point {
x: s * 50.0,
y: s * 139.0,
},
&Point {
x: s * 100.0,
y: s * 60.0,
},
&Point {
x: s * 10.0,
y: s * 10.5,
},
);
}

fn main() {
Expand Down
14 changes: 7 additions & 7 deletions examples/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ fn main() {
for _ in 0..n_iter {
match font.render_glyph(glyph_id, size) {
Some(_glyph) => (),
None => ()
None => (),
}
}
let elapsed = start.elapsed().unwrap();
let elapsed = elapsed.as_secs() as f64 + 1e-9 * (elapsed.subsec_nanos() as f64);
let elapsed =
elapsed.as_secs() as f64 + 1e-9 * (elapsed.subsec_nanos() as f64);
println!("{} {}", size, elapsed * (1e6 / n_iter as f64));
}
} else {
match font.render_glyph(glyph_id, 400) {
Some(glyph) => dump_pgm(&glyph, &out_filename),
None => println!("failed to render {} {}", filename, glyph_id)
None => println!("failed to render {} {}", filename, glyph_id),
}
}
},
Err(_) => println!("failed to parse {}", filename)
}
}
Err(_) => println!("failed to parse {}", filename),
},
}

}
56 changes: 56 additions & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# This file was originally created by running the command
# rustfmt --dump-default-config rustfmt.toml && sort -u rustfmt.toml -o rustfmt.toml.
# Changes from the defaults are marked with comments.
binop_separator = "Front"
blank_lines_lower_bound = 0
blank_lines_upper_bound = 1
brace_style = "SameLineWhere"
color = "Auto"
combine_control_expr = true
comment_width = 100 # Fuchsia uses 100
condense_wildcard_suffixes = false
control_brace_style = "AlwaysSameLine"
disable_all_formatting = false
empty_item_single_line = true
error_on_line_overflow = false
error_on_unformatted = false
fn_args_density = "Compressed" # Fuchsia prefers compressed
fn_single_line = false
force_explicit_abi = true
force_multiline_blocks = false
format_strings = true # otherwise strings will violate max_width
hard_tabs = false
hide_parse_errors = false
imports_indent = "Visual"
imports_layout = "Mixed"
indent_style = "Block"
match_arm_blocks = true
match_block_trailing_comma = false
max_width = 100
merge_derives = true
merge_imports = false
newline_style = "Unix"
normalize_comments = false
remove_blank_lines_at_start_or_end_of_block = true
reorder_impl_items = false
reorder_imports = true
reorder_modules = true
report_fixme = "Never"
report_todo = "Never"
skip_children = false
space_after_colon = true
space_before_colon = false
spaces_around_ranges = false
spaces_within_parens_and_brackets = false
struct_field_align_threshold = 0
struct_lit_single_line = true
tab_spaces = 4
trailing_comma = "Vertical"
trailing_semicolon = true
type_punctuation_density = "Wide"
unstable_features = false
use_field_init_shorthand = false
use_small_heuristics = true
use_try_shorthand = true # Fuchsia prefers the shortcut
where_single_line = false
wrap_comments = true # otherwise comments will violate max_width
Loading

0 comments on commit c5b27c8

Please sign in to comment.