MSRV bump.

Closes #54
linebender · Aug 24, 2022 · 375ab05 · 375ab05
1 parent cc7e248
commit 375ab05
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.46.0
+          - 1.51.0
           - stable
     steps:
     - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Rename `NormalizedF32::from_u8` into `NormalizedF32::new_u8`.
 - Rename `NormalizedF32::new_bounded` into `NormalizedF32::new_clamped`.
 - Use explicit SIMD intrinsic instead of relying on `safe_arch`.
+- MSRV bumped to 1.51
 
 ## [0.7.0] - 2022-07-03
 ### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,8 +16,7 @@ members = ["path"]
 
 [dependencies]
 arrayref = "0.3.6"
-# do not update to 0.6, because it requires Rust >= 1.51
-arrayvec = { version = "0.5", default-features = false }
+arrayvec = { version = "0.7", default-features = false }
 bytemuck = "1.4"
 cfg-if = "1"
 png = { version = "0.17", optional = true }

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 ![Build Status](https://github.com/RazrFalcon/tiny-skia/workflows/Rust/badge.svg)
 [![Crates.io](https://img.shields.io/crates/v/tiny-skia.svg)](https://crates.io/crates/tiny-skia)
 [![Documentation](https://docs.rs/tiny-skia/badge.svg)](https://docs.rs/tiny-skia)
-[![Rust 1.46+](https://img.shields.io/badge/rust-1.46+-orange.svg)](https://www.rust-lang.org)
+[![Rust 1.51+](https://img.shields.io/badge/rust-1.51+-orange.svg)](https://www.rust-lang.org)
 
 `tiny-skia` is a tiny [Skia] subset ported to Rust.
 

diff --git a/path/README.md b/path/README.md
@@ -2,7 +2,7 @@
 ![Build Status](https://github.com/RazrFalcon/tiny-skia/workflows/Rust/badge.svg)
 [![Crates.io](https://img.shields.io/crates/v/tiny-skia-path.svg)](https://crates.io/crates/tiny-skia-path)
 [![Documentation](https://docs.rs/tiny-skia-path/badge.svg)](https://docs.rs/tiny-skia-path)
-[![Rust 1.46+](https://img.shields.io/badge/rust-1.46+-orange.svg)](https://www.rust-lang.org)
+[![Rust 1.51+](https://img.shields.io/badge/rust-1.51+-orange.svg)](https://www.rust-lang.org)
 
 A [tiny-skia](https://github.com/RazrFalcon/tiny-skia) Bezier path implementation.
 

diff --git a/src/edge_clipper.rs b/src/edge_clipper.rs
@@ -34,7 +34,7 @@ macro_rules! copy_4_points {
 /// Max curvature in X and Y split cubic into 9 pieces, * (line + cubic).
 const MAX_VERBS: usize = 18;
 
-pub type ClippedEdges = ArrayVec<[PathEdge; MAX_VERBS]>;
+pub type ClippedEdges = ArrayVec<PathEdge, MAX_VERBS>;
 
 pub struct EdgeClipper {
     clip: Rect,

diff --git a/src/pipeline/mod.rs b/src/pipeline/mod.rs
@@ -329,7 +329,7 @@ pub struct TileCtx {
 }
 
 pub struct RasterPipelineBuilder {
-    stages: ArrayVec<[Stage; MAX_STAGES]>,
+    stages: ArrayVec<Stage, MAX_STAGES>,
     force_hq_pipeline: bool,
     pub ctx: Context,
 }
@@ -394,7 +394,7 @@ impl RasterPipelineBuilder {
             .all(|stage| !lowp::fn_ptr_eq(lowp::STAGES[*stage as usize], lowp::null_fn));
 
         if self.force_hq_pipeline || !is_lowp_compatible {
-            let mut functions: ArrayVec<_> = self.stages.iter()
+            let mut functions: ArrayVec<_, MAX_STAGES> = self.stages.iter()
                 .map(|stage| highp::STAGES[*stage as usize] as highp::StageFn)
                 .collect();
             functions.push(highp::just_return as highp::StageFn);
@@ -422,7 +422,7 @@ impl RasterPipelineBuilder {
                 ctx: self.ctx,
             }
         } else {
-            let mut functions: ArrayVec<_> = self.stages.iter()
+            let mut functions: ArrayVec<_, MAX_STAGES> = self.stages.iter()
                 .map(|stage| lowp::STAGES[*stage as usize] as lowp::StageFn)
                 .collect();
             functions.push(lowp::just_return as lowp::StageFn);
@@ -451,12 +451,12 @@ impl RasterPipelineBuilder {
 
 pub enum RasterPipelineKind {
     High {
-        functions: ArrayVec<[highp::StageFn; MAX_STAGES]>,
-        tail_functions: ArrayVec<[highp::StageFn; MAX_STAGES]>,
+        functions: ArrayVec<highp::StageFn, MAX_STAGES>,
+        tail_functions: ArrayVec<highp::StageFn, MAX_STAGES>,
     },
     Low {
-        functions: ArrayVec<[lowp::StageFn; MAX_STAGES]>,
-        tail_functions: ArrayVec<[lowp::StageFn; MAX_STAGES]>,
+        functions: ArrayVec<lowp::StageFn, MAX_STAGES>,
+        tail_functions: ArrayVec<lowp::StageFn, MAX_STAGES>,
     },
 }