From 9103a8b763718dad8a0f483e3d53ccd6ddf99c54 Mon Sep 17 00:00:00 2001
From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com>
Date: Sat, 10 Apr 2021 01:42:56 -0300
Subject: [PATCH 1/2] Use the new Cargo resolver from Rust 1.50

This should make it possible to add the dev-dependency on criterion
without breaking `no_std` builds.
---
 Cargo.toml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d9418a88..6db688b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,11 +79,7 @@ proptest = { version = "1", optional = true, default-features = false, features
 serde_json = "1.0"
 rand_xorshift = "0.3"
 rand_isaac = "0.3"
-### Uncomment this line before running benchmarks.
-### We can't just let this uncommented because that would break
-### compilation for #[no-std] because of the terrible Cargo bug
-### https://github.com/rust-lang/cargo/issues/4866
-#criterion = "0.2.10"
+criterion = "0.2.10"
 
 # For matrix comparison macro
 matrixcompare = "0.2.0"
@@ -91,6 +87,7 @@ itertools = "0.10"
 
 [workspace]
 members = [ "nalgebra-lapack", "nalgebra-glm", "nalgebra-sparse" ]
+resolver = "2"
 
 [[bench]]
 name = "nalgebra_bench"

From 7f0a22bd22b8e60e63848e13111e7a20c4cc6e89 Mon Sep 17 00:00:00 2001
From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com>
Date: Sat, 10 Apr 2021 01:58:20 -0300
Subject: [PATCH 2/2] Fix CI for `nalgebra-glm`

Some features were specified that do not exist for the crate. With the
new Cargo resolver, this is an error, so these features were removed.
---
 .github/workflows/nalgebra-ci-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/nalgebra-ci-build.yml b/.github/workflows/nalgebra-ci-build.yml
index e4791f97..d302c908 100644
--- a/.github/workflows/nalgebra-ci-build.yml
+++ b/.github/workflows/nalgebra-ci-build.yml
@@ -57,7 +57,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: test nalgebra-glm
-        run: cargo test -p nalgebra-glm --features arbitrary,rand,serde-serialize,abomonation-serialize,sparse,debug,io,compare,libm,proptest-support,slow-tests;
+        run: cargo test -p nalgebra-glm --features arbitrary,serde-serialize,abomonation-serialize;
   test-nalgebra-sparse:
     runs-on: ubuntu-latest
     steps: