diff options
author | Jovansonlee Cesar <ivanceras@gmail.com> | 2020-05-09 12:16:18 +0800 |
---|---|---|
committer | Jovansonlee Cesar <ivanceras@gmail.com> | 2020-05-09 12:16:18 +0800 |
commit | b74f5c5d011c3d831684211092569c35bf673df3 (patch) | |
tree | 84c96452547b8c3fd5a34c54416e3af800c0895a | |
parent | 86d2f7d529fcd6f99b198cedc7a35aa73b1cc39e (diff) |
make the crate compile to stable
-rw-r--r-- | svgbob/src/buffer/cell_buffer/cell.rs | 15 | ||||
-rw-r--r-- | svgbob/src/buffer/fragment_buffer/fragment.rs | 3 | ||||
-rw-r--r-- | svgbob/src/buffer/fragment_buffer/fragment_tree.rs | 1 | ||||
-rw-r--r-- | svgbob/src/buffer/property_buffer.rs | 4 | ||||
-rw-r--r-- | svgbob/src/lib.rs | 3 |
5 files changed, 3 insertions, 23 deletions
diff --git a/svgbob/src/buffer/cell_buffer/cell.rs b/svgbob/src/buffer/cell_buffer/cell.rs index 99bdade..9aca82d 100644 --- a/svgbob/src/buffer/cell_buffer/cell.rs +++ b/svgbob/src/buffer/cell_buffer/cell.rs @@ -297,21 +297,6 @@ pub fn rearrange_bound(bound1: Cell, bound2: Cell) -> (Cell, Cell) { #[cfg(test)] mod tests { use super::*; - extern crate test; - use test::{black_box, Bencher}; - - #[bench] - fn bench_adjacent(bencher: &mut Bencher) { - bencher.iter(|| { - for i in 0..1000 { - for j in 0..1000 { - let cell1 = Cell::new(i, j); - let cell2 = Cell::new(i + 1, j + 1); - black_box(cell1.is_adjacent(&cell2)); - } - } - }) - } #[test] fn test_bottom_right() { diff --git a/svgbob/src/buffer/fragment_buffer/fragment.rs b/svgbob/src/buffer/fragment_buffer/fragment.rs index 3329315..faa7680 100644 --- a/svgbob/src/buffer/fragment_buffer/fragment.rs +++ b/svgbob/src/buffer/fragment_buffer/fragment.rs @@ -65,7 +65,7 @@ impl Fragment { pub fn match_unicode(fragments: &Vec<Self>) -> Option<char> { let mut sorted_shapes = fragments.clone(); sorted_shapes.sort(); - assert!(sorted_shapes.is_sorted()); + //assert!(sorted_shapes.is_sorted()); FRAGMENTS_UNICODE.get(&sorted_shapes).map(|c| *c) } @@ -616,7 +616,6 @@ impl PartialEq for Fragment { #[cfg(test)] mod tests { use super::*; - extern crate test; use crate::buffer::CellGrid; #[test] diff --git a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs b/svgbob/src/buffer/fragment_buffer/fragment_tree.rs index e3f476b..7006f2a 100644 --- a/svgbob/src/buffer/fragment_buffer/fragment_tree.rs +++ b/svgbob/src/buffer/fragment_buffer/fragment_tree.rs @@ -124,7 +124,6 @@ impl FragmentTree { #[cfg(test)] mod tests { use super::*; - extern crate test; use crate::{ buffer::Cell, fragment::{rect, CellText}, diff --git a/svgbob/src/buffer/property_buffer.rs b/svgbob/src/buffer/property_buffer.rs index 4642273..1c7b907 100644 --- a/svgbob/src/buffer/property_buffer.rs +++ b/svgbob/src/buffer/property_buffer.rs @@ -112,9 +112,9 @@ impl<'p> PropertyBuffer<'p> { Fragment::merge_recursive(behavioral_fragments); merged_behavioral_fragments.sort(); merged_behavioral_fragments.dedup(); - assert!(merged_behavioral_fragments.is_sorted()); + //assert!(merged_behavioral_fragments.is_sorted()); - assert!(fragments.is_sorted()); + //assert!(fragments.is_sorted()); if merged_behavioral_fragments == *fragments { Some(*ch) } else { diff --git a/svgbob/src/lib.rs b/svgbob/src/lib.rs index 95cde12..c8b118e 100644 --- a/svgbob/src/lib.rs +++ b/svgbob/src/lib.rs @@ -1,7 +1,4 @@ -//#![deny(warnings)] #![deny(clippy::all)] -#![feature(is_sorted)] -#![feature(test)] pub mod buffer; mod map; |