srenblad/nalgebra
1
0
Fork 0
forked from M-Labs/nalgebra
Code Pull Requests Activity

Merge pull request #863 from vks/cargo-resolver

Browse Source 
Use the new Cargo resolver from Rust 1.50
This commit is contained in:
Sébastien Crozet 2021-04-11 13:40:29 +02:00 committed by GitHub
commit 002b3677c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nalgebra-ci-build.yml vendored
View File

@ -57,7 +57,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: test nalgebra-glm - 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: test-nalgebra-sparse:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

7
Cargo.toml
View File

@ -79,11 +79,7 @@ proptest = { version = "1", optional = true, default-features = false, features
serde_json = "1.0" serde_json = "1.0"
rand_xorshift = "0.3" rand_xorshift = "0.3"
rand_isaac = "0.3" rand_isaac = "0.3"
### Uncomment this line before running benchmarks. criterion = "0.2.10"
### 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"
# For matrix comparison macro # For matrix comparison macro
matrixcompare = "0.2.0" matrixcompare = "0.2.0"
@ -91,6 +87,7 @@ itertools = "0.10"
[workspace] [workspace]
members = [ "nalgebra-lapack", "nalgebra-glm", "nalgebra-sparse" ] members = [ "nalgebra-lapack", "nalgebra-glm", "nalgebra-sparse" ]
resolver = "2"
[[bench]] [[bench]]
name = "nalgebra_bench" name = "nalgebra_bench"