Update deps

crev-dev · Nov 2, 2020 · 96e9065 · 96e9065
1 parent 04c6d46
commit 96e9065
Show file tree

Hide file tree

Showing 18 changed files with 335 additions and 281 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-crev/Cargo.toml b/cargo-crev/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = '2018'
 name = "cargo-crev"
-version = "0.18.0"
+version = "0.18.1"
 description = "Scalable, social, Code REView system that we desperately need - Rust/cargo frontend"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 documentation = "https://docs.rs/crev"
@@ -21,19 +21,19 @@ name = "cargo_crev"
 path = "src/lib.rs"
 
 [dependencies]
-crev-common = { path = "../crev-common", version = "0.18.0" }
-crev-data = { path = "../crev-data", version = "0.18.0" }
-crev-wot = { path = "../crev-wot", version = "0.18.0" }
-crev-lib = { path = "../crev-lib", version = "0.18.0" }
+crev-common = { path = "../crev-common", version = "0.18.1" }
+crev-data = { path = "../crev-data", version = "0.18.1" }
+crev-wot = { path = "../crev-wot", version = "0.18.1" }
+crev-lib = { path = "../crev-lib", version = "0.18.1" }
 anyhow = "1.0.31"
 atty = "0.2.14"
-cargo = "0.47.0"
+cargo = "0.48"
 cargo-platform = "0.1.1"
 chrono = "0.4.11"
 crates_io_api = "0.6"
 crossbeam = "0.7.3"
 crossterm = "0.9.6"
-env_logger = { version = "0.7.1", default-features = false, features = ["termcolor", "atty", "humantime"] }
+env_logger = { version = "0.8", default-features = false, features = ["termcolor", "atty", "humantime"] }
 fnv = "1.0.6"
 geiger = "0.4.4"
 insideout = "0.2.0"
@@ -42,7 +42,6 @@ num_cpus = "1.12.0"
 petgraph = "0.5.0"
 rayon = "1.3.0"
 resiter = "0.4.0"
-semver = "0.10.0"
 serde = "1.0.106"
 serde_json = "1.0.51"
 serde_yaml = "0.8.11"
@@ -55,7 +54,7 @@ walkdir = "2.3.1"
 openssl-sys = { version = "0.9.55", features = ["vendored"] }
 failure = "0.1.8"
 git2 = "0.13.5"
-tempdir = "0.3.7"
+tempfile = "3.1.0"
 rprompt = "1.0.5"
 
 [features]

diff --git a/cargo-crev/src/deps.rs b/cargo-crev/src/deps.rs
@@ -1,6 +1,6 @@
 use crev_data::{proof, Digest, PublicId};
 use crev_lib::*;
-use semver::Version;
+use crev_data::Version;
 use std::path::PathBuf;
 
 use crate::{opts::*, prelude::*, shared::*, term};

diff --git a/cargo-crev/src/edit.rs b/cargo-crev/src/edit.rs
@@ -28,7 +28,7 @@ fn get_editor_to_use() -> Result<ffi::OsString> {
 
 /// Retruns the edited string, and bool indicating if the file was ever written to/ (saved).
 fn edit_text_iteractively_raw(text: &str) -> Result<(String, bool)> {
- let dir = tempdir::TempDir::new("crev")?;
+ let dir = tempfile::tempdir()?;
  let file_path = dir.path().join("crev.review.yaml");
  std::fs::write(&file_path, text)?;
 
@@ -89,7 +89,7 @@ pub fn edit_file(path: &Path) -> Result<()> {
 pub fn edit_proof_content_iteractively<C: proof::ContentWithDraft>(
  content: &C,
  previous_date: Option<&proof::Date>,
- base_version: Option<&semver::Version>,
+ base_version: Option<&crev_data::Version>,
 ) -> Result<C> {
  let mut text = String::new();
  if let Some(date) = previous_date {

diff --git a/cargo-crev/src/main.rs b/cargo-crev/src/main.rs
@@ -136,7 +136,7 @@ fn crate_review(args: opts::CrateReview) -> Result<()> {
 }
 
 pub fn cargo_registry_to_crev_source_id(source_id: &cargo::core::SourceId) -> String {
- let s = source_id.into_url().to_string();
+ let s = source_id.as_url().to_string();
  if &s == "registry+https://github.com/rust-lang/crates.io-index" {
  crate::PROJECT_SOURCE_CRATES_IO.into()
  } else {

diff --git a/cargo-crev/src/opts.rs b/cargo-crev/src/opts.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Result};
 use crev_data::Level;
-use semver::Version;
+use crev_data::Version;
 use std::{ffi::OsString, path::PathBuf};
 use structopt::StructOpt;
 
@@ -565,7 +565,7 @@ pub struct CrateReview {
 
  #[structopt(long = "diff")]
  #[allow(clippy::option_option)]
- pub diff: Option<Option<semver::Version>>,
+ pub diff: Option<Option<crev_data::Version>>,
 
  #[structopt(flatten)]
  pub cargo_opts: CargoOpts,

diff --git a/cargo-crev/src/prelude.rs b/cargo-crev/src/prelude.rs
@@ -1,2 +1,2 @@
 pub use anyhow::{bail, format_err, Context, Result};
-pub use semver::Version;
+pub use crev_data::Version;
diff --git a/crev-common/Cargo.toml b/crev-common/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2018"
 name = "crev-common"
-version = "0.18.0"
+version = "0.18.1"
 description = "Scalable, social, Code REView system that we desperately need - common code"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 documentation = "https://docs.rs/crev"
@@ -12,7 +12,7 @@ license = "MPL-2.0 OR MIT OR Apache-2.0"
 readme = "../README.md"
 
 [dependencies]
-base64 = "0.12.0"
+base64 = "0.13"
 blake2 = "0.8.1"
 chrono = "0.4.11"
 digest = "0.8.1"

diff --git a/crev-data/Cargo.toml b/crev-data/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = '2018'
 name = "crev-data"
-version = "0.18.0"
+version = "0.18.1"
 description = "Scalable, social, Code REView system that we desperately need - data types library"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 documentation = "https://docs.rs/crev"
@@ -12,7 +12,7 @@ license = "MPL-2.0 OR MIT OR Apache-2.0"
 readme = "../README.md"
 
 [dependencies]
-crev-common = { path = "../crev-common", version = "0.18.0" }
+crev-common = { path = "../crev-common", version = "0.18.1" }
 chrono = "0.4.11"
 derive_builder = "0.9.0"
 ed25519-dalek = "1.0.0"

diff --git a/crev-lib/Cargo.toml b/crev-lib/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2018"
 name = "crev-lib"
-version = "0.18.0"
+version = "0.18.1"
 description = "Scalable, social, Code REView system that we desperately need - core library"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 documentation = "https://docs.rs/crev"
@@ -12,10 +12,10 @@ license = "MPL-2.0 OR MIT OR Apache-2.0"
 readme = "../README.md"
 
 [dependencies]
-crev-common = { path = "../crev-common", version = "0.18.0" }
+crev-common = { path = "../crev-common", version = "0.18.1" }
 miscreant = { version = "0.4", features = ["soft-aes"] }
-crev-data = { path = "../crev-data", version = "0.18.0" }
-crev-wot = { path = "../crev-wot", version = "0.18.0" }
+crev-data = { path = "../crev-data", version = "0.18.1" }
+crev-wot = { path = "../crev-wot", version = "0.18.1" }
 blake2 = "0.8.1"
 chrono = "0.4.11"
 crev-recursive-digest = "0.4.0"
@@ -28,7 +28,6 @@ log = "0.4.8"
 num_cpus = "1.12.0"
 resiter = "0.4.0"
 rust-argon2 = "0.8.2"
-semver = "0.10.0"
 serde = "1.0.106"
 serde_cbor = "0.11.1"
 serde_yaml = "0.8.11"

diff --git a/crev-lib/src/activity.rs b/crev-lib/src/activity.rs
@@ -8,7 +8,7 @@ use crev_common::{
  self,
  serde::{as_rfc3339_fixed, from_rfc3339_fixed},
 };
-use semver::Version;
+use crev_data::Version;
 use serde::{Deserialize, Serialize};
 
 pub type Date = chrono::DateTime<chrono::FixedOffset>;

diff --git a/crev-lib/src/lib.rs b/crev-lib/src/lib.rs
@@ -20,7 +20,7 @@ use crev_data::{
  Digest, Id,
 };
 pub use crev_wot::TrustDistanceParams;
-use semver::Version;
+use crev_data::Version;
 use std::{
  collections::{HashMap, HashSet},
  fmt,

diff --git a/crev-lib/src/local.rs b/crev-lib/src/local.rs
@@ -287,7 +287,7 @@ impl Local {
  &self,
  source: &str,
  name: &str,
- version: &semver::Version,
+ version: &crev_data::Version,
  ) -> PathBuf {
  self.cache_activity_path()
  .join("review")
@@ -302,7 +302,7 @@ impl Local {
  &self,
  source: &str,
  name: &str,
- version: &semver::Version,
+ version: &crev_data::Version,
  activity: &ReviewActivity,
  ) -> Result<()> {
  let path = self.cache_review_activity_path(source, name, version);
@@ -318,7 +318,7 @@ impl Local {
  &self,
  source: &str,
  name: &str,
- version: &semver::Version,
+ version: &crev_data::Version,
  ) -> Result<Option<ReviewActivity>> {
  let path = self.cache_review_activity_path(source, name, version);
 

diff --git a/crev-lib/src/tests.rs b/crev-lib/src/tests.rs
@@ -5,7 +5,7 @@ use crev_data::{
 };
 use crev_wot::{FetchSource, ProofDB};
 use default::default;
-use semver::Version;
+use crev_data::Version;
 use std::{str::FromStr, sync::Arc};
 
 mod issues;

diff --git a/crev-lib/src/tests/issues.rs b/crev-lib/src/tests/issues.rs
@@ -6,7 +6,7 @@ use crev_data::{
  TrustLevel, UnlockedId,
 };
 use crev_wot::FetchSource;
-use semver::Version;
+use crev_data::Version;
 
 const SOURCE: &str = "SOURCE_ID";
 const NAME: &str = "name";

diff --git a/crev-wot/Cargo.toml b/crev-wot/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2018"
 name = "crev-wot"
-version = "0.18.0"
+version = "0.18.1"
 description = "Scalable, social, Code REView system that we desperately need - Web of Trust library"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 documentation = "https://docs.rs/crev"
@@ -12,13 +12,12 @@ license = "MPL-2.0 OR MIT OR Apache-2.0"
 readme = "../README.md"
 
 [dependencies]
-crev-common = { path = "../crev-common", version = "0.18.0" }
-crev-data = { path = "../crev-data", version = "0.18.0" }
+crev-common = { path = "../crev-common", version = "0.18.1" }
+crev-data = { path = "../crev-data", version = "0.18.1" }
 blake2 = "0.8.1"
 chrono = "0.4.11"
 default = "0.1.2"
 log = "0.4.8"
-semver = "0.10.0"
 serde = "1.0.106"
 serde_yaml = "0.8.11"
 thiserror = "1.0.17"
diff --git a/crev-wot/src/lib.rs b/crev-wot/src/lib.rs
@@ -20,7 +20,7 @@ use crev_data::{
 };
 use default::default;
 use log::debug;
-use semver::Version;
+use crev_data::Version;
 use std::{
  collections::{BTreeMap, BTreeSet, HashMap, HashSet},
  sync,

diff --git a/crevsum/Cargo.toml b/crevsum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "crevsum"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Dawid Ciężarkiewicz <[email protected]>"]
 edition = "2018"
 description = "Recursive digest as calculated by `crev`"
@@ -13,7 +13,7 @@ readme = "README.md"
 
 [dependencies]
 common_failures = "0.1"
-crev-common = { path = "../crev-common", version = "0.18.0" }
+crev-common = { path = "../crev-common", version = "0.18.1" }
 crev-recursive-digest = { version = "0.2.1" }
 hex = "0.4"
 structopt = "0.3"