Commit c0eea763 authored by Alex Butler's avatar Alex Butler

Update rusttype-dev glium to 0.26

cargo fmt
parent bb9d9d2f
Pipeline #6975 passed with stages
in 7 minutes and 6 seconds
......@@ -7,7 +7,7 @@ publish = false
[dev-dependencies]
rusttype = { path = "../", features = ["gpu_cache"] }
glium = "0.25"
glium = "0.26"
image = { version = "0.23", default-features = false, features = ["png"] }
arrayvec = { version = "0.5", default-features = false }
once_cell = "1"
......
......@@ -70,7 +70,6 @@ fn bench_draw_w(c: &mut Criterion) {
"c0e795601e3412144d1bfdc0cd94d9507aa9775a0f0f4f9862fe7ec7e83d7684"
);
});
}
fn bench_draw_iota(c: &mut Criterion) {
......@@ -102,7 +101,6 @@ fn bench_draw_iota(c: &mut Criterion) {
"cdad348e38263a13f68ae41a95ce3b900d2881375a745232309ebd568a27cd4c"
);
});
}
criterion_group!(
......
......@@ -14,7 +14,7 @@ fn bench_layout_a_sentence(c: &mut Criterion) {
c.bench_function("layout_a_sentence", |b| {
let mut glyphs = vec![];
b.iter(|| {
glyphs.clear();
glyphs.extend(font.layout(SENTENCE, Scale::uniform(25.0), point(100.0, 25.0)))
......
This diff is collapsed.
......@@ -116,10 +116,10 @@ use alloc::rc::Rc as Arc;
#[cfg(feature = "has-atomics")]
use alloc::sync::Arc;
#[cfg(not(feature = "std"))]
use alloc::{boxed::Box, vec::Vec};
#[cfg(all(feature = "libm-math", not(feature = "std")))]
use crate::nostd_float::FloatExt;
#[cfg(not(feature = "std"))]
use alloc::{boxed::Box, vec::Vec};
/// A collection of fonts read straight from a font file's data. The data in the
/// collection is not validated. This structure may or may not own the font
......
......@@ -2,9 +2,9 @@ use crate::geometry::*;
use approx::relative_eq;
use ordered_float::OrderedFloat;
use alloc::vec::Vec;
#[cfg(all(feature = "libm-math", not(feature = "std")))]
use crate::nostd_float::FloatExt;
use alloc::vec::Vec;
trait SliceUp: Sized {
type PerSlice: Iterator<Item = Self>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment