[librsvg: 2/4] Bump required version of Rust to 1.42




commit 010c33476282c6a32b582f20033e97e773680d3c
Author: Sven Neumann <sven svenfoo org>
Date:   Thu Oct 15 20:10:48 2020 +0200

    Bump required version of Rust to 1.42
    
    This allows us to remove the use of the matches crate as the
    matches! macro was stabilized with that release.

 COMPILING.md                           | 2 +-
 Cargo.lock                             | 1 -
 configure.ac                           | 2 +-
 rsvg_internals/Cargo.toml              | 1 -
 rsvg_internals/src/aspect_ratio.rs     | 1 -
 rsvg_internals/src/drawing_ctx.rs      | 1 -
 rsvg_internals/src/element.rs          | 1 -
 rsvg_internals/src/filters/lighting.rs | 1 -
 rsvg_internals/src/gradient.rs         | 1 -
 rsvg_internals/src/href.rs             | 1 -
 rsvg_internals/src/node.rs             | 1 -
 rsvg_internals/src/pattern.rs          | 1 -
 rsvg_internals/src/properties.rs       | 1 -
 rsvg_internals/src/property_defs.rs    | 1 -
 14 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/COMPILING.md b/COMPILING.md
index f734f2c8..3e6b5ef6 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -32,7 +32,7 @@ minimum version is listed here; you may use a newer version instead.
 **Compilers:**
 
 * a C compiler and `make` tool; we recommend GNU `make`.
-* rust 1.40 or later
+* rust 1.42 or later
 * cargo
 
 **Mandatory dependencies:**
diff --git a/Cargo.lock b/Cargo.lock
index 806e9e55..67e8a557 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1548,7 +1548,6 @@ dependencies = [
  "libc",
  "locale_config",
  "markup5ever",
- "matches",
  "nalgebra",
  "num-traits",
  "once_cell",
diff --git a/configure.ac b/configure.ac
index 3122a088..d3bfa667 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AS_IF(test x$RUSTC = xno,
 dnl Minimum version of rustc that we support
 dnl If you change this, please update COMPILING.md
 MINIMUM_RUST_MAJOR=1
-MINIMUM_RUST_MINOR=40
+MINIMUM_RUST_MINOR=42
 
 rust_version=`$RUSTC --version`
 version=`echo "$rust_version" | sed -e 's/^rustc //g'`
diff --git a/rsvg_internals/Cargo.toml b/rsvg_internals/Cargo.toml
index 6843fef8..27f947b9 100644
--- a/rsvg_internals/Cargo.toml
+++ b/rsvg_internals/Cargo.toml
@@ -28,7 +28,6 @@ language-tags = "0.2.2"
 libc = "0.2"
 locale_config = "*" # recommended explicitly by locale_config's README.md
 markup5ever = "0.10"
-matches = "0.1"
 nalgebra = "0.21.0"
 num-traits = "0.2"
 once_cell = "1.2.0"
diff --git a/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
index ac02c6dc..f663c541 100644
--- a/rsvg_internals/src/aspect_ratio.rs
+++ b/rsvg_internals/src/aspect_ratio.rs
@@ -21,7 +21,6 @@
 //! [spec]: https://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
 
 use cssparser::{BasicParseError, Parser};
-use matches::matches;
 use std::ops::Deref;
 
 use crate::error::*;
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index d8a95ce7..f4431e4b 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -1,7 +1,6 @@
 //! The main context structure which drives the drawing process.
 
 use float_cmp::approx_eq;
-use matches::matches;
 use once_cell::sync::Lazy;
 use pango::FontMapExt;
 use regex::{Captures, Regex};
diff --git a/rsvg_internals/src/element.rs b/rsvg_internals/src/element.rs
index 20f467ea..b9644776 100644
--- a/rsvg_internals/src/element.rs
+++ b/rsvg_internals/src/element.rs
@@ -2,7 +2,6 @@
 
 use locale_config::{LanguageRange, Locale};
 use markup5ever::{expanded_name, local_name, namespace_url, ns, QualName};
-use matches::matches;
 use once_cell::sync::Lazy;
 use std::collections::{HashMap, HashSet};
 use std::fmt;
diff --git a/rsvg_internals/src/filters/lighting.rs b/rsvg_internals/src/filters/lighting.rs
index 4402718d..9552809e 100644
--- a/rsvg_internals/src/filters/lighting.rs
+++ b/rsvg_internals/src/filters/lighting.rs
@@ -2,7 +2,6 @@
 
 use float_cmp::approx_eq;
 use markup5ever::{expanded_name, local_name, namespace_url, ns};
-use matches::matches;
 use nalgebra::{Vector2, Vector3};
 use num_traits::identities::Zero;
 use rayon::prelude::*;
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index d4396981..56001f89 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -4,7 +4,6 @@ use cssparser::Parser;
 use markup5ever::{
     expanded_name, local_name, namespace_url, ns, ExpandedName, LocalName, Namespace,
 };
-use matches::matches;
 use std::cell::RefCell;
 
 use crate::attributes::Attributes;
diff --git a/rsvg_internals/src/href.rs b/rsvg_internals/src/href.rs
index b2a802cf..3628828c 100644
--- a/rsvg_internals/src/href.rs
+++ b/rsvg_internals/src/href.rs
@@ -8,7 +8,6 @@
 //! other.  We implement that logic in this module.
 
 use markup5ever::{expanded_name, local_name, namespace_url, ns, ExpandedName};
-use matches::matches;
 
 /// Returns whether the attribute is either of `xlink:href` or `href`.
 ///
diff --git a/rsvg_internals/src/node.rs b/rsvg_internals/src/node.rs
index b7933cfb..ce191583 100644
--- a/rsvg_internals/src/node.rs
+++ b/rsvg_internals/src/node.rs
@@ -12,7 +12,6 @@
 //! [`NodeData`]: struct.NodeData.html
 
 use markup5ever::QualName;
-use matches::matches;
 use std::cell::{Ref, RefMut};
 use std::fmt;
 
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index 8436f34d..70e5e0a5 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -1,7 +1,6 @@
 //! The `pattern` element.
 
 use markup5ever::{expanded_name, local_name, namespace_url, ns};
-use matches::matches;
 use std::cell::RefCell;
 
 use crate::aspect_ratio::*;
diff --git a/rsvg_internals/src/properties.rs b/rsvg_internals/src/properties.rs
index 775f9551..a7ac1ae9 100644
--- a/rsvg_internals/src/properties.rs
+++ b/rsvg_internals/src/properties.rs
@@ -24,7 +24,6 @@ use cssparser::{
 use markup5ever::{
     expanded_name, local_name, namespace_url, ns, ExpandedName, LocalName, QualName,
 };
-use matches::matches;
 use std::collections::HashSet;
 
 use crate::attributes::Attributes;
diff --git a/rsvg_internals/src/property_defs.rs b/rsvg_internals/src/property_defs.rs
index 8c01a1af..0e15e965 100644
--- a/rsvg_internals/src/property_defs.rs
+++ b/rsvg_internals/src/property_defs.rs
@@ -44,7 +44,6 @@
 use std::convert::TryInto;
 
 use cssparser::{Parser, Token};
-use matches::matches;
 
 use crate::dasharray::Dasharray;
 use crate::error::*;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]