api/cli: upgrade dependencies and rustc to 1.65.0 (#151)

Author: mcobzarenco

Cargo.lock

@@ -12,17 +12,17 @@ edition = "2021"
 name = "reinfer_client"
 
 [dependencies]
-chrono = { version = "0.4.19", features = ["serde"] }
+chrono = { version = "0.4.22", features = ["serde"] }
 log = "0.4.17"
-once_cell = "1.12.0"
-ordered-float = { version = "3.0.0", features = ["serde"] }
-regex = "1.5.6"
-reqwest = { version = "0.11.11", default-features = false, features = ["blocking", "gzip", "json", "multipart", "native-tls-vendored"] }
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
-serde_with = "1.14.0"
-thiserror = "1.0.31"
-url = "2.2.2"
+once_cell = "1.16.0"
+ordered-float = { version = "3.3.0", features = ["serde"] }
+regex = "1.6.0"
+reqwest = { version = "0.11.12", default-features = false, features = ["blocking", "gzip", "json", "multipart", "native-tls-vendored"] }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = "1.0.87"
+serde_with = "2.0.1"
+thiserror = "1.0.37"
+url = "2.3.1"
 
 [dev-dependencies]
 mockito = "0.31.0"

api/Cargo.toml

@@ -17,28 +17,28 @@ path = "src/main.rs"
 name = "tests"
 
 [dependencies]
-anyhow = "1.0.58"
-chrono = "0.4.19"
+anyhow = "1.0.66"
+chrono = "0.4.22"
 colored = "2.0.0"
 dirs = "4.0.0"
-env_logger = "0.9.0"
+env_logger = "0.9.1"
 indicatif = "0.16.2"
 log = { version = "0.4.17", default-features = false, features = ["release_max_level_info"] }
 maplit = "1.0.2"
-once_cell = "1.12.0"
-prettytable-rs = "0.8.0"
-regex = "1.5.6"
-reqwest = { version = "0.11.11", default-features = false }
-serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
+once_cell = "1.16.0"
+prettytable-rs = "0.9.0"
+regex = "1.6.0"
+reqwest = { version = "0.11.12", default-features = false }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = "1.0.87"
 structopt = { version = "0.3.26", default-features = false }
-url = { version = "2.2.2", features = ["serde"] }
+url = { version = "2.3.1", features = ["serde"] }
 
 reinfer-client = { version = "0.12.0", path = "../api" }
 
 [dev-dependencies]
-pretty_assertions = "1.2.1"
-uuid = { version = "1.1.2", features = ["v4"] }
+pretty_assertions = "1.3.0"
+uuid = { version = "1.2.1", features = ["v4"] }
 
 [features]
 default = []

cli/Cargo.toml

@@ -1,6 +1,6 @@
 use colored::Colorize;
 use log::{error, info, warn};
-use prettytable::{self, cell, row, Table};
+use prettytable::{self, row, Table};
 use reinfer_client::DEFAULT_ENDPOINT;
 use reqwest::Url;
 use std::path::Path;

cli/src/commands/config.rs

@@ -47,7 +47,7 @@ pub fn create(client: &Client, args: &CreateEmailsArgs) -> Result<()> {
                 bucket.full_name(),
                 bucket.id,
             );
-            let file_metadata = fs::metadata(&emails_path).with_context(|| {
+            let file_metadata = fs::metadata(emails_path).with_context(|| {
                 format!(
                     "Could not get file metadata for `{}`",
                     emails_path.display()

cli/src/commands/create/emails.rs

@@ -1,5 +1,5 @@
 use colored::Colorize;
-use prettytable::{cell, format, row, Row, Table};
+use prettytable::{format, row, Row, Table};
 use reinfer_client::{Bucket, Dataset, Project, Source, Trigger, User};
 use serde::{Serialize, Serializer};
 

cli/src/printer.rs

@@ -38,7 +38,7 @@ impl TestCli {
     }
 
     pub fn user(&self) -> User {
-        let output = self.run(&["--output=json", "get", "current-user"]);
+        let output = self.run(["--output=json", "get", "current-user"]);
         serde_json::from_str::<User>(&output).expect("Failed to deserialize user response")
     }
 

cli/tests/common.rs

@@ -9,7 +9,7 @@ fn test_bucket_lifecycle() {
     let new_bucket_name = format!("{}/test-source-{}", owner, Uuid::new_v4());
 
     // Create bucket
-    let output = cli.run(&[
+    let output = cli.run([
         "create",
         "bucket",
         &new_bucket_name,
@@ -18,14 +18,14 @@ fn test_bucket_lifecycle() {
     ]);
     assert!(output.contains(&new_bucket_name), "{}", output);
 
-    let output = cli.run(&["get", "buckets"]);
+    let output = cli.run(["get", "buckets"]);
     assert!(output.contains(&new_bucket_name), "{}", output);
 
     // Deleting one comment reduces the comment count in the source
-    let output = cli.run(&["delete", "bucket", &new_bucket_name]);
+    let output = cli.run(["delete", "bucket", &new_bucket_name]);
     assert!(output.is_empty(), "{}", output);
 
-    let output = cli.run(&["get", "buckets"]);
+    let output = cli.run(["get", "buckets"]);
     assert!(!output.contains(&new_bucket_name), "{}", output);
 }
 
@@ -36,7 +36,7 @@ fn test_bucket_with_invalid_transform_tag_fails() {
 
     let new_bucket_name = format!("{}/test-source-{}", owner, Uuid::new_v4());
 
-    let output = cli.run_and_error(&[
+    let output = cli.run_and_error([
         "create",
         "bucket",
         &new_bucket_name,
@@ -56,7 +56,7 @@ fn test_bucket_with_invalid_transform_tag_fails() {
 fn test_create_without_org_fails() {
     let cli = TestCli::get();
 
-    let output = cli.run_and_error(&[
+    let output = cli.run_and_error([
         "create",
         "bucket",
         "bucket-name-without-org",
@@ -74,7 +74,7 @@ fn test_create_without_org_fails() {
 fn test_create_with_empty_org_fails() {
     let cli = TestCli::get();
 
-    let output = cli.run_and_error(&[
+    let output = cli.run_and_error([
         "create",
         "bucket",
         "/bucket-name-with-empty-org",
@@ -92,7 +92,7 @@ fn test_create_with_empty_org_fails() {
 fn test_create_with_empty_bucket_name_fails() {
     let cli = TestCli::get();
 
-    let output = cli.run_and_error(&[
+    let output = cli.run_and_error([
         "create",
         "bucket",
         "org-without-bucket-name/",
@@ -110,7 +110,7 @@ fn test_create_with_empty_bucket_name_fails() {
 fn test_create_with_too_many_seperators_fails() {
     let cli = TestCli::get();
 
-    let output = cli.run_and_error(&[
+    let output = cli.run_and_error([
         "create",
         "bucket",
         "Bucket/Name/with/too/many/seperators/",

cli/tests/test_buckets.rs

@@ -63,12 +63,12 @@ fn check_comments_lifecycle(comments_str: &str, args: Vec<&str>) {
     );
     assert!(output.is_empty());
 
-    let output = cli.run(&["get", "comments", source.identifier()]);
+    let output = cli.run(["get", "comments", source.identifier()]);
     assert_eq!(output.lines().count(), annotated_comments.len());
 
     // Test getting a comment by id to check the content matches
     let test_comment = annotated_comments.get(0).unwrap().comment.clone();
-    let output = cli.run(&[
+    let output = cli.run([
         "get",
         "comment",
         &format!("--source={}", source.identifier()),
@@ -85,15 +85,15 @@ fn check_comments_lifecycle(comments_str: &str, args: Vec<&str>) {
     );
 
     // Deleting one comment reduces the comment count in the source
-    let output = cli.run(&[
+    let output = cli.run([
         "delete",
         "comments",
         &format!("--source={}", source.identifier()),
         &annotated_comments.get(0).unwrap().comment.id.0,
     ]);
     assert!(output.is_empty());
 
-    let output = cli.run(&["get", "comments", source.identifier()]);
+    let output = cli.run(["get", "comments", source.identifier()]);
     assert_eq!(output.lines().count(), annotated_comments.len() - 1);
 
     // Delete all ids
@@ -106,7 +106,7 @@ fn check_comments_lifecycle(comments_str: &str, args: Vec<&str>) {
     let output = cli.run(&args);
     assert!(output.is_empty());
 
-    let output = cli.run(&["get", "comments", source.identifier()]);
+    let output = cli.run(["get", "comments", source.identifier()]);
     assert!(output.is_empty());
 }
 
@@ -130,7 +130,7 @@ fn test_delete_comments_in_range() {
 
     // Upload our test data
     let output = cli.run_with_stdin(
-        &[
+        [
             "create",
             "comments",
             "--allow-duplicates",
@@ -141,11 +141,11 @@ fn test_delete_comments_in_range() {
     );
     assert!(output.is_empty());
 
-    let uploaded_all = cli.run(&["get", "comments", source.identifier()]);
+    let uploaded_all = cli.run(["get", "comments", source.identifier()]);
     assert_eq!(uploaded_all.lines().count(), num_comments);
 
     // Download annotated comments and check count
-    let uploaded_annotated = cli.run(&[
+    let uploaded_annotated = cli.run([
         "get",
         "comments",
         "--reviewed-only",
@@ -163,7 +163,7 @@ fn test_delete_comments_in_range() {
     let to_timestamp_str = "2020-02-01T00:00:00Z";
     let to_timestamp = DateTime::parse_from_rfc3339(to_timestamp_str).unwrap();
 
-    cli.run(&[
+    cli.run([
         "delete",
         "bulk",
         "--source",
@@ -185,7 +185,7 @@ fn test_delete_comments_in_range() {
         .count();
 
     // Get all comments and check counts
-    let after_deleting_range = cli.run(&[
+    let after_deleting_range = cli.run([
         "get",
         "comments",
         "--dataset",
@@ -198,7 +198,7 @@ fn test_delete_comments_in_range() {
     );
 
     // Delete comments in source, excluding annotated comments
-    cli.run(&[
+    cli.run([
         "delete",
         "bulk",
         "--source",
@@ -207,7 +207,7 @@ fn test_delete_comments_in_range() {
     ]);
 
     // Get all comments and check that only annotated ones are left
-    let after_deleting_unannotated = cli.run(&[
+    let after_deleting_unannotated = cli.run([
         "get",
         "comments",
         "--dataset",
@@ -217,15 +217,15 @@ fn test_delete_comments_in_range() {
     assert_eq!(after_deleting_unannotated.lines().count(), num_annotated);
 
     // Delete all comments
-    cli.run(&[
+    cli.run([
         "delete",
         "bulk",
         &format!("--source={}", source.identifier()),
         "--include-annotated=true",
     ]);
 
     // Get all comments and check there are none left
-    let after_deleting_all = cli.run(&[
+    let after_deleting_all = cli.run([
         "get",
         "comments",
         "--dataset",