diff --git a/CHANGELOG.md b/CHANGELOG.md index 5da6281..98e1f3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -171,6 +171,8 @@ Main commands: * `gooseberry move` - move annotations from one group to another (**move** not copy). Useful if you have a bunch of annotations scattered around and want to move them into one group for gooseberry. +[0.9.2]: https://github.com/out-of-cheese-error/gooseberry/compare/0.9.1...0.9.2 + [0.9.1]: https://github.com/out-of-cheese-error/gooseberry/compare/0.9.0...0.9.1 [0.9.0]: https://github.com/out-of-cheese-error/gooseberry/compare/0.8.1...0.9.0 diff --git a/Cargo.lock b/Cargo.lock index b2e3af7..d996910 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2636,15 +2636,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" dependencies = [ "bytes", "libc", "memchr", "mio", "num_cpus", + "once_cell", "pin-project-lite", "socket2", "tokio-macros", diff --git a/Cargo.toml b/Cargo.toml index 2f9a9b3..e639026 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "gooseberry" version = "0.9.2" authors = ["Ninjani"] -edition = "2018" +edition = "2021" description = "A command line utility to generate a knowledge base from Hypothesis annotations " repository = "https://github.com/out-of-cheese-error/gooseberry" readme = "README.md" @@ -14,7 +14,7 @@ include = ["src/**/*", "README.md"] [dependencies] # Hypothesis hypothesis = { version = "0.10.2", default-features = false } -tokio = { version = "1.17.0", features = ["macros"] } +tokio = { version = "1.18.0", features = ["macros"] } # To extract the base URI url = "2.2.2" diff --git a/src/gooseberry/knowledge_base.rs b/src/gooseberry/knowledge_base.rs index 7cde24d..018bf31 100644 --- a/src/gooseberry/knowledge_base.rs +++ b/src/gooseberry/knowledge_base.rs @@ -225,7 +225,7 @@ fn group_annotations_by_order( order_to_annotations } -fn sort_annotations(sort: &[OrderBy], annotations: &mut Vec) { +fn sort_annotations(sort: &[OrderBy], annotations: &mut [AnnotationTemplate]) { annotations.sort_by(|a, b| { sort.iter().fold(Ordering::Equal, |acc, &field| { acc.then_with(|| match field { @@ -307,7 +307,7 @@ impl Gooseberry { make: bool, index: bool, ) -> color_eyre::Result<()> { - let mut annotations = annotations + let mut annotations: Vec<_> = annotations .into_iter() .map(AnnotationTemplate::from_annotation) .collect();