ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

build: use assert_matches crate

Browse source 
The `assert_matches` feature is nightly-only, so use this crate as a shim.
This commit is contained in:
Waleed Khan 2022-02-20 21:45:09 -08:00
parent 75480c2bdc
commit dd3272fe90
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -17,6 +17,12 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "assert_matches"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
[[package]]
name = "atty"
version = "0.2.14"
@ -588,6 +594,7 @@ dependencies = [
name = "jujutsu-lib"
version = "0.2.0"
dependencies = [
"assert_matches",
"backoff",
"blake2",
"byteorder",
@ -1426,9 +1433,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "walkdir"

1
lib/Cargo.toml
View file

@ -40,5 +40,6 @@ whoami = "1.2.1"
zstd = "0.10.0"
[dev-dependencies]
assert_matches = "1.5.0"
num_cpus = "1.13.1"
test-case = "1.2.3"

1
lib/src/lib.rs
View file

@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#![feature(assert_matches)]
#![deny(unused_must_use)]
#[macro_use]

2
lib/src/revset.rs
View file

@ -1311,7 +1311,7 @@ pub fn revset_for_commits<'revset, 'repo: 'revset>(
#[cfg(test)]
mod tests {
use std::assert_matches::assert_matches;
use assert_matches::assert_matches;
use super::*;

5
lib/tests/test_merge_trees.rs
View file

@ -12,10 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#![feature(assert_matches)]
use std::assert_matches::assert_matches;
use assert_matches::assert_matches;
use itertools::Itertools;
use jujutsu_lib::backend::{ConflictPart, TreeValue};
use jujutsu_lib::commit_builder::CommitBuilder;