From cc27051067c751d939e5ce35d9cb2c1aa1ad116e Mon Sep 17 00:00:00 2001 From: Jori Lampi Date: Mon, 22 Nov 2021 17:49:49 +0200 Subject: [PATCH 1/3] Update tmc-langs to 0.19.0 --- Cargo.lock | 45 +++++++++++++++-------------- Cargo.toml | 9 +++--- src/commands/command_util.rs | 47 +++++++++++++++---------------- src/commands/courses_command.rs | 33 +++++++++------------- src/commands/download_command.rs | 4 +-- src/commands/exercises_command.rs | 28 +++++++++--------- src/commands/login_command.rs | 2 +- src/commands/submit_command.rs | 8 +++++- 8 files changed, 87 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index af5069b..b74213d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2210,14 +2210,14 @@ dependencies = [ [[package]] name = "tmc-client" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "chrono", "dirs", "http", - "lazy_static", "log", "oauth2", + "once_cell", "percent-encoding", "regex", "reqwest", @@ -2235,18 +2235,18 @@ dependencies = [ [[package]] name = "tmc-langs" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "base64 0.13.0", "dirs", "hmac", "impl-enum", "jwt", - "lazy_static", "log", "md5", "nix", "oauth2", + "once_cell", "regex", "rpassword", "schemars", @@ -2273,7 +2273,7 @@ dependencies = [ [[package]] name = "tmc-langs-csharp" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "dirs", "log", @@ -2289,11 +2289,10 @@ dependencies = [ [[package]] name = "tmc-langs-framework" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "fd-lock", "isolang", - "lazy_static", "log", "nom", "once_cell", @@ -2312,13 +2311,13 @@ dependencies = [ [[package]] name = "tmc-langs-java" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "dirs", "flate2", "j4rs", - "lazy_static", "log", + "once_cell", "serde", "serde_json", "tar", @@ -2332,10 +2331,10 @@ dependencies = [ [[package]] name = "tmc-langs-make" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ - "lazy_static", "log", + "once_cell", "regex", "serde", "serde-xml-rs", @@ -2349,7 +2348,7 @@ dependencies = [ [[package]] name = "tmc-langs-notests" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "log", "tmc-langs-framework", @@ -2359,7 +2358,7 @@ dependencies = [ [[package]] name = "tmc-langs-plugins" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "impl-enum", "log", @@ -2379,13 +2378,13 @@ dependencies = [ [[package]] name = "tmc-langs-python3" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "dunce", "hex", "hmac", - "lazy_static", "log", + "once_cell", "rand 0.8.3", "serde", "serde_json", @@ -2399,7 +2398,7 @@ dependencies = [ [[package]] name = "tmc-langs-r" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "log", "serde", @@ -2413,7 +2412,7 @@ dependencies = [ [[package]] name = "tmc-langs-util" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=13f3d55#13f3d55035a3cf6c8229dea498081c06f4a78dc5" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" dependencies = [ "fd-lock", "log", @@ -2849,18 +2848,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.7.0+zstd.1.4.9" +version = "0.8.3+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428752481d8372e15b1bf779ea518a179ad6c771cca2d2c60e4fbff3cc2cd52" +checksum = "5ea7094c7b4a58fbd738eb0d4a2fc7684a0e6949a31597e074ffe20a07cbc2bf" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.1.0+zstd.1.4.9" +version = "4.1.0+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa1926623ad7fe406e090555387daf73db555b948134b4d73eac5eb08fb666d" +checksum = "d30375f78e185ca4c91930f42ea2c0162f9aa29737032501f93b79266d985ae7" dependencies = [ "libc", "zstd-sys", @@ -2868,9 +2867,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.5.0+zstd.1.4.9" +version = "1.6.0+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 681cc01..f8862ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,10 +22,11 @@ serde = "1" serde_json = "1" log = "0.4" dirs = "3" -tmc-langs-util = { git = "https://github.com/rage/tmc-langs-rust/", rev = "13f3d55" } -tmc-langs-framework = { git = "https://github.com/rage/tmc-langs-rust/", rev = "13f3d55" } -tmc-langs = { git = "https://github.com/rage/tmc-langs-rust/", rev = "13f3d55" } -tmc-client = { git = "https://github.com/rage/tmc-langs-rust/", rev = "13f3d55" } +# rev 12f021b = 0.19.0 +tmc-langs-util = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } +tmc-langs-framework = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } +tmc-langs = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } +tmc-client = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } rpassword = "5.0.1" mockall = "0.9.0" indicatif = "0.15.0" diff --git a/src/commands/command_util.rs b/src/commands/command_util.rs index b82693f..bdadda1 100644 --- a/src/commands/command_util.rs +++ b/src/commands/command_util.rs @@ -1,12 +1,15 @@ use isolang::Language; +use reqwest::Url; use std::path::Path; use std::path::PathBuf; use std::env; -use tmc_client::{ - ClientError, Course, CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, - Organization, SubmissionFinished, TmcClient, Token, +use std::str::FromStr; +use tmc_client::response::{ + Course, CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization, + SubmissionFinished, }; +use tmc_client::{ClientError, TmcClient, Token}; use tmc_langs::Credentials; use tmc_langs::DownloadOrUpdateCourseExercisesResult; use tmc_langs::DownloadResult; @@ -33,7 +36,7 @@ pub trait Client { fn list_courses(&mut self) -> Result, String>; fn get_organizations(&mut self) -> Result, String>; fn logout(&mut self); - fn wait_for_submission(&self, submission_url: &str) -> Result; + fn wait_for_submission(&self, submission_url: Url) -> Result; fn submit( &self, projects_dir: &Path, @@ -41,18 +44,18 @@ pub trait Client { exercise_slug: &str, locale: Option, ) -> Result; - fn get_course_exercises(&mut self, course_id: usize) -> Result, String>; + fn get_course_exercises(&mut self, course_id: u32) -> Result, String>; fn get_exercise_details( &mut self, - exercise_ids: Vec, + exercise_ids: Vec, ) -> Result, String>; fn download_or_update_exercises( &mut self, - download_params: &[usize], + download_params: &[u32], path: &Path, ) -> Result; fn is_test_mode(&mut self) -> bool; - fn get_course_details(&self, course_id: usize) -> Result; + fn get_course_details(&self, course_id: u32) -> Result; fn get_organization(&self, organization_slug: &str) -> Result; fn update_exercises( &mut self, @@ -68,11 +71,10 @@ pub trait Client { ) -> Result; } -static SERVER_ADDRESS: &str = "https://tmc.mooc.fi"; impl ClientProduction { pub fn new(test_mode: bool) -> Self { let (tmc_client, _credentials) = tmc_langs::init_tmc_client_with_credentials( - SERVER_ADDRESS.to_string(), + Url::from_str("https://tmc.mooc.fi").expect(""), PLUGIN, "1.0.0", ) @@ -165,10 +167,7 @@ impl Client for ClientProduction { } if let Some(credentials) = get_credentials() { - match self.tmc_client.set_token(credentials.token()) { - Ok(()) => return Ok(()), - _ => return Err("Setting login token failed".to_string()), - } + self.tmc_client.set_token(credentials.token()); } Err("No login found. You need to be logged in to use this command".to_string()) } @@ -256,7 +255,7 @@ impl Client for ClientProduction { } Ok(course_list) } - Err(ClientError::NotLoggedIn) => { + Err(ClientError::NotAuthenticated) => { Err("Login token is invalid. Please try logging in again.".to_string()) } _ => Err("Unknown error. Please try again.".to_string()), @@ -318,8 +317,8 @@ impl Client for ClientProduction { credentials.remove().unwrap(); } - fn wait_for_submission(&self, submission_url: &str) -> Result { - self.tmc_client.wait_for_submission(submission_url) + fn wait_for_submission(&self, submission_url: Url) -> Result { + self.tmc_client.wait_for_submission_at(submission_url) } fn update_exercises( &mut self, @@ -359,7 +358,7 @@ impl Client for ClientProduction { ) } - fn get_course_exercises(&mut self, course_id: usize) -> Result, String> { + fn get_course_exercises(&mut self, course_id: u32) -> Result, String> { if self.test_mode { return Ok(vec![CourseExercise { id: 0, @@ -376,7 +375,7 @@ impl Client for ClientProduction { } match self.tmc_client.get_course_exercises(course_id) { Ok(exercises) => Ok(exercises), - Err(ClientError::NotLoggedIn) => { + Err(ClientError::NotAuthenticated) => { Err("Login token is invalid. Please try logging in again.".to_string()) } _ => Err("Unknown error. Please try again.".to_string()), @@ -385,7 +384,7 @@ impl Client for ClientProduction { fn get_exercise_details( &mut self, - exercise_ids: Vec, + exercise_ids: Vec, ) -> Result, String> { if self.test_mode { return Ok(vec![ExercisesDetails { @@ -403,7 +402,7 @@ impl Client for ClientProduction { fn download_or_update_exercises( &mut self, - exercise_ids: &[usize], + exercise_ids: &[u32], path: &Path, ) -> Result { if self.test_mode { @@ -416,7 +415,7 @@ impl Client for ClientProduction { tmc_langs::download_or_update_course_exercises(&self.tmc_client, path, exercise_ids, true) } - fn get_course_details(&self, course_id: usize) -> Result { + fn get_course_details(&self, course_id: u32) -> Result { if self.test_mode { let course = Course { id: 0, @@ -496,11 +495,11 @@ pub fn set_organization(org: &str) -> Result<(), String> { Ok(()) } -/// Returns course id as: Ok(Some(usize)) or Ok(None) if not found, Err(msg) if could not get id list +/// Returns course id as: Ok(Some(u32)) or Ok(None) if not found, Err(msg) if could not get id list pub fn get_course_id_by_name( client: &mut dyn Client, course_name: String, -) -> Result, String> { +) -> Result, String> { match client.list_courses() { Ok(courses) => { for course in courses { diff --git a/src/commands/courses_command.rs b/src/commands/courses_command.rs index 6c4221e..686885f 100644 --- a/src/commands/courses_command.rs +++ b/src/commands/courses_command.rs @@ -1,6 +1,6 @@ use super::command_util::Client; use crate::io_module::{Io, PrintColor}; -use tmc_client::Course; +use tmc_client::response::Course; /// Lists available courses from clients organization pub fn list_courses(io: &mut dyn Io, client: &mut dyn Client) { @@ -24,10 +24,14 @@ fn print_courses(io: &mut dyn Io, course_list: Vec) { mod tests { use super::*; use isolang::Language; + use reqwest::Url; use std::path::Path; use std::slice::Iter; - use tmc_client::{ClientError, CourseExercise, NewSubmission, SubmissionStatus}; - use tmc_client::{Organization, SubmissionFinished}; + use tmc_client::response::{ + CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization, + SubmissionFinished, SubmissionStatus, + }; + use tmc_client::ClientError; use tmc_langs::DownloadOrUpdateCourseExercisesResult; use tmc_langs::DownloadResult; use tmc_langs::LangsError; @@ -142,7 +146,7 @@ mod tests { } fn wait_for_submission( &self, - _submission_url: &str, + _submission_url: Url, ) -> Result { Ok(SubmissionFinished { api_version: 0, @@ -170,23 +174,20 @@ mod tests { validations: None, }) } - fn get_course_exercises( - &mut self, - _course_id: usize, - ) -> Result, String> { + fn get_course_exercises(&mut self, _course_id: u32) -> Result, String> { Ok(vec![]) } fn get_exercise_details( &mut self, - _exercise_ids: Vec, - ) -> Result, String> { + _exercise_ids: Vec, + ) -> Result, String> { todo!() } fn download_or_update_exercises( &mut self, - _download_params: &[usize], + _download_params: &[u32], _path: &Path, ) -> Result { Ok(DownloadResult::Success { @@ -195,16 +196,10 @@ mod tests { }) } - fn get_course_details( - &self, - _: usize, - ) -> std::result::Result { + fn get_course_details(&self, _: u32) -> std::result::Result { todo!() } - fn get_organization( - &self, - _: &str, - ) -> std::result::Result { + fn get_organization(&self, _: &str) -> std::result::Result { todo!() } } diff --git a/src/commands/download_command.rs b/src/commands/download_command.rs index 4501198..b0a7a48 100644 --- a/src/commands/download_command.rs +++ b/src/commands/download_command.rs @@ -7,7 +7,7 @@ use crate::interactive; use crate::io_module::{Io, PrintColor}; use crate::progress_reporting; use crate::progress_reporting::ProgressBarManager; -use tmc_client::Course; +use tmc_client::response::Course; use tmc_langs::ClientUpdateData; use tmc_langs::DownloadResult; @@ -149,7 +149,7 @@ pub fn download_exercises( ) -> Result { match client.get_course_exercises(course.id) { Ok(exercises) => { - let exercise_ids: Vec = exercises + let exercise_ids: Vec = exercises .iter() .filter(|t| !t.disabled && t.unlocked) .map(|t| t.id) diff --git a/src/commands/exercises_command.rs b/src/commands/exercises_command.rs index 7e25f7d..c276b5f 100644 --- a/src/commands/exercises_command.rs +++ b/src/commands/exercises_command.rs @@ -1,7 +1,7 @@ use super::command_util::{get_course_id_by_name, Client}; use crate::io_module::{Io, PrintColor}; -use tmc_client::CourseExercise; +use tmc_client::response::CourseExercise; /// Lists exercises for a given course pub fn list_exercises(io: &mut dyn Io, client: &mut dyn Client, course_name: String) { @@ -94,12 +94,13 @@ fn print_exercises(io: &mut dyn Io, course_name: String, exercises: Vec Result { Ok(SubmissionFinished { api_version: 0, @@ -239,10 +240,7 @@ mod tests { validations: None, }) } - fn get_course_exercises( - &mut self, - _course_id: usize, - ) -> Result, String> { + fn get_course_exercises(&mut self, _course_id: u32) -> Result, String> { /*TODO: ExercisePoint is in private module*/ //let points = vec![]; //let awarded_points = vec![/*"1.1".to_string()*/]; @@ -316,8 +314,8 @@ mod tests { fn get_exercise_details( &mut self, - _exercise_ids: Vec, - ) -> Result, String> { + _exercise_ids: Vec, + ) -> Result, String> { todo!() } fn update_exercises( @@ -328,7 +326,7 @@ mod tests { } fn download_or_update_exercises( &mut self, - _download_params: &[usize], + _download_params: &[u32], _path: &Path, ) -> Result { Ok(DownloadResult::Success { @@ -339,8 +337,8 @@ mod tests { fn get_course_details( &self, - _: usize, - ) -> std::result::Result { + _: u32, + ) -> std::result::Result { todo!() } fn get_organization( diff --git a/src/commands/login_command.rs b/src/commands/login_command.rs index 22765c6..fcfdbd0 100644 --- a/src/commands/login_command.rs +++ b/src/commands/login_command.rs @@ -132,7 +132,7 @@ mod tests { use super::super::command_util::*; use super::*; use std::slice::Iter; - use tmc_client::Organization; + use tmc_client::response::Organization; pub struct IoTest<'a> { list: &'a mut Vec, diff --git a/src/commands/submit_command.rs b/src/commands/submit_command.rs index bbea45d..94a6d76 100644 --- a/src/commands/submit_command.rs +++ b/src/commands/submit_command.rs @@ -4,6 +4,7 @@ use crate::io_module::{Io, PrintColor}; use crate::progress_reporting; use crate::progress_reporting::ProgressBarManager; use anyhow::{Context, Result}; +use reqwest::Url; use tmc_langs::ClientUpdateData; use tmc_langs::Language; use tmc_langs::NewSubmission; @@ -66,7 +67,12 @@ fn submit_logic(io: &mut dyn Io, client: &mut dyn Client, path: Option<&str>) { new_submission.show_submission_url )); - match client.wait_for_submission(&new_submission.submission_url) { + let submission_url = Url::parse(&new_submission.submission_url); + if let Err(err) = submission_url { + io.println(&err.to_string(), PrintColor::Failed); + return; + } + match client.wait_for_submission(submission_url.unwrap()) { Ok(submission_finished) => { manager.join(); From e886ee0d961a927a04f8ad6b56ed0e90c40d3005 Mon Sep 17 00:00:00 2001 From: Jori Lampi Date: Tue, 23 Nov 2021 11:06:15 +0200 Subject: [PATCH 2/3] Update to tmc-langs 0.23.2 --- Cargo.lock | 731 +++++++++++++++-------------------- Cargo.toml | 10 +- src/commands/command_util.rs | 1 + src/updater.rs | 1 - 4 files changed, 310 insertions(+), 433 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b74213d..8b23fed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,15 +28,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "62e1f47f7dc0422027a4e370dd4548d4d66b26782e513e98dca1e689e058a80e" [[package]] name = "assert_cmd" @@ -88,12 +82,11 @@ dependencies = [ [[package]] name = "async-io" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" +checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" dependencies = [ "concurrent-queue", - "fastrand", "futures-lite", "libc", "log", @@ -117,21 +110,20 @@ dependencies = [ [[package]] name = "async-net" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b0a74e7f70af3c8cf1aa539edbd044795706659ac52b78a71dc1a205ecefdf" +checksum = "5373304df79b9b4395068fb080369ec7178608827306ce4d081cba51cac551df" dependencies = [ "async-io", "blocking", - "fastrand", "futures-lite", ] [[package]] name = "async-process" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac" +checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" dependencies = [ "async-io", "blocking", @@ -140,7 +132,7 @@ dependencies = [ "futures-lite", "libc", "once_cell", - "signal-hook 0.3.8", + "signal-hook 0.3.10", "winapi", ] @@ -179,12 +171,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -193,21 +179,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -220,9 +194,9 @@ dependencies = [ [[package]] name = "blocking" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +checksum = "046e47d4b2d391b1f6f8b407b1deb8dee56c1852ccd868becf2710f601b5f427" dependencies = [ "async-channel", "async-task", @@ -234,9 +208,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" [[package]] name = "byteorder" @@ -246,15 +220,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bzip2" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" dependencies = [ "bzip2-sys", "libc", @@ -262,9 +236,9 @@ dependencies = [ [[package]] name = "bzip2-sys" -version = "0.1.10+1.0.8" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" dependencies = [ "cc", "libc", @@ -285,9 +259,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" dependencies = [ "jobserver", ] @@ -353,13 +327,13 @@ dependencies = [ [[package]] name = "console" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" +checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", "regex", "terminal_size", "unicode-width", @@ -368,9 +342,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" dependencies = [ "libc", ] @@ -436,9 +410,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ "generic-array", "subtle", @@ -468,6 +442,15 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + [[package]] name = "dirs-sys" version = "0.3.6" @@ -493,9 +476,9 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "dunce" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4" +checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" [[package]] name = "dyn-clone" @@ -511,9 +494,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.28" +version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ "cfg-if", ] @@ -536,28 +519,29 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "fastrand" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" +checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" dependencies = [ "instant", ] [[package]] name = "fd-lock" -version = "2.0.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0010f02effd88c702318c5dde0463206be67495d0b4d906ba7c0a8f166cc7f06" +checksum = "b8806dd91a06a7a403a8e596f9bfbfb34e469efbc363fc9c9713e79e26472e36" dependencies = [ + "cfg-if", "libc", "winapi", ] [[package]] name = "filetime" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ "cfg-if", "libc", @@ -567,9 +551,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if", "crc32fast", @@ -620,38 +604,32 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "fastrand", "futures-core", @@ -664,9 +642,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" dependencies = [ "autocfg 1.0.1", "proc-macro-hack", @@ -677,21 +655,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" dependencies = [ "autocfg 1.0.1", "futures-core", @@ -718,24 +696,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] @@ -746,9 +715,9 @@ checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" [[package]] name = "h2" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -765,15 +734,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -786,9 +755,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ "crypto-mac", "digest", @@ -796,9 +765,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" dependencies = [ "bytes", "fnv", @@ -807,9 +776,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", @@ -818,21 +787,21 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05842d0d43232b23ccb7060ecb0f0626922c21f30012e97b767b30afd4a5d4b9" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.7" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54" +checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" dependencies = [ "bytes", "futures-channel", @@ -844,7 +813,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project", + "pin-project-lite", "socket2", "tokio", "tower-service", @@ -890,9 +859,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg 1.0.1", "hashbrown", @@ -912,18 +881,18 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "isolang" @@ -937,9 +906,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "j4rs" @@ -948,7 +917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de204777df8f1b7ddd414468755d6a7e5919ad62834aca23bf6166ecb557fac9" dependencies = [ "cesu8", - "dirs", + "dirs 3.0.2", "fs_extra", "java-locator", "jni-sys", @@ -979,29 +948,29 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] [[package]] name = "jwt" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e46349d67dc03bdbdb28da0337a355a53ca1d5156452722c36fe21d0e6389b" +checksum = "98328bb4f360e6b2ceb1f95645602c7014000ef0c3809963df8ad3a3a09f8d99" dependencies = [ - "base64 0.13.0", + "base64", "crypto-mac", "digest", "hmac", @@ -1016,24 +985,11 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.94" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libloading" @@ -1053,9 +1009,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ "scopeguard", ] @@ -1071,9 +1027,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "md5" @@ -1083,9 +1039,18 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg 1.0.1", +] [[package]] name = "mime" @@ -1103,6 +1068,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -1115,9 +1086,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -1164,26 +1135,25 @@ dependencies = [ [[package]] name = "nix" -version = "0.20.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188" dependencies = [ "bitflags", "cc", "cfg-if", "libc", + "memoffset", ] [[package]] name = "nom" -version = "6.1.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" dependencies = [ - "bitvec", - "funty", - "lexical-core", "memchr", + "minimal-lexical", "version_check", ] @@ -1239,14 +1209,15 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "oauth2" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ad4d0136960353683efa6160b9c867088b4b8f567b762cd37420a10ce32703" +checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" dependencies = [ - "base64 0.12.3", + "base64", "chrono", + "getrandom", "http", - "rand 0.7.3", + "rand 0.8.4", "reqwest", "serde", "serde_json", @@ -1258,9 +1229,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -1276,9 +1247,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -1287,9 +1258,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if", "instant", @@ -1343,31 +1314,11 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -1377,28 +1328,28 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" [[package]] name = "polling" -version = "2.0.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" +checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" dependencies = [ "cfg-if", "libc", "log", - "wepoll-sys", + "wepoll-ffi", "winapi", ] [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "predicates" @@ -1421,12 +1372,12 @@ checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" dependencies = [ "predicates-core", - "treeline", + "termtree", ] [[package]] @@ -1443,28 +1394,22 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" version = "0.6.5" @@ -1486,27 +1431,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ - "getrandom 0.1.16", "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -dependencies = [ - "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -1521,22 +1453,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1556,20 +1478,11 @@ checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.2", + "getrandom", ] [[package]] @@ -1583,20 +1496,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1663,9 +1567,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -1676,7 +1580,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.2", + "getrandom", "redox_syscall", ] @@ -1708,11 +1612,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124" +checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1780,7 +1684,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64", "log", "ring", "sct", @@ -1804,9 +1708,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6ab463ae35acccb5cba66c0084c985257b797d288b6050cc2f6ac1b266cb78" +checksum = "271ac0c667b8229adf70f0f957697c96fafd7486ab7481e15dc5e45e3e6a4368" dependencies = [ "chrono", "dyn-clone", @@ -1817,9 +1721,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "902fdfbcf871ae8f653bddf4b2c05905ddaabc08f69d32a915787e3be0d31356" +checksum = "6ebda811090b257411540779860bc09bf321bc587f58d2c5864309d1566214e7" dependencies = [ "proc-macro2", "quote", @@ -1845,18 +1749,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde-xml-rs" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0bf1ba0696ccf0872866277143ff1fd14d22eec235d2b23702f95e6660f7dfa" +checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", "serde", @@ -1866,9 +1770,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -1888,9 +1792,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19" dependencies = [ "itoa", "ryu", @@ -1899,9 +1803,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f6109f0506e20f7e0f910e51a0079acf41da8e0694e6442527c4ddf5a2b158" +checksum = "d0421d4f173fab82d72d6babf36d57fae38b994ca5c2d78e704260ba6d12118b" dependencies = [ "serde", ] @@ -1920,21 +1824,21 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" dependencies = [ "dtoa", - "linked-hash-map", + "indexmap", "serde", "yaml-rust", ] [[package]] name = "sha2" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if", @@ -1966,9 +1870,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.8" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", @@ -1976,9 +1880,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] @@ -1991,15 +1895,15 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "smol" @@ -2021,9 +1925,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi", @@ -2035,12 +1939,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.8.0" @@ -2049,9 +1947,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "subprocess" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b9ad6c3e1b525a55872a4d2f2d404b3c959b7bbcbfd83c364580f68ed157bd" +checksum = "055cf3ebc2981ad8f0a5a17ef6652f652d87831f79fddcba2ac57bcb9a0aa407" dependencies = [ "libc", "winapi", @@ -2059,32 +1957,26 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.72" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", "unicode-xid", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" +checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" dependencies = [ "filetime", "libc", @@ -2099,7 +1991,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", "libc", - "rand 0.8.3", + "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -2116,14 +2008,20 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", "winapi", ] +[[package]] +name = "termtree" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" + [[package]] name = "textwrap" version = "0.11.0" @@ -2135,18 +2033,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -2165,9 +2063,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -2186,7 +2084,7 @@ dependencies = [ "assert_cmd", "clap", "crossterm 0.19.0", - "dirs", + "dirs 3.0.2", "indicatif", "isolang", "log", @@ -2210,10 +2108,10 @@ dependencies = [ [[package]] name = "tmc-client" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "chrono", - "dirs", + "dirs 4.0.0", "http", "log", "oauth2", @@ -2235,10 +2133,10 @@ dependencies = [ [[package]] name = "tmc-langs" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ - "base64 0.13.0", - "dirs", + "base64", + "dirs 4.0.0", "hmac", "impl-enum", "jwt", @@ -2273,9 +2171,9 @@ dependencies = [ [[package]] name = "tmc-langs-csharp" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ - "dirs", + "dirs 4.0.0", "log", "serde", "serde_json", @@ -2289,7 +2187,7 @@ dependencies = [ [[package]] name = "tmc-langs-framework" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "fd-lock", "isolang", @@ -2311,9 +2209,9 @@ dependencies = [ [[package]] name = "tmc-langs-java" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ - "dirs", + "dirs 4.0.0", "flate2", "j4rs", "log", @@ -2331,7 +2229,7 @@ dependencies = [ [[package]] name = "tmc-langs-make" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "log", "once_cell", @@ -2348,7 +2246,7 @@ dependencies = [ [[package]] name = "tmc-langs-notests" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "log", "tmc-langs-framework", @@ -2358,7 +2256,7 @@ dependencies = [ [[package]] name = "tmc-langs-plugins" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "impl-enum", "log", @@ -2378,14 +2276,14 @@ dependencies = [ [[package]] name = "tmc-langs-python3" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "dunce", "hex", "hmac", "log", "once_cell", - "rand 0.8.3", + "rand 0.8.4", "serde", "serde_json", "sha2", @@ -2393,12 +2291,13 @@ dependencies = [ "tmc-langs-framework", "tmc-langs-util", "walkdir", + "zip", ] [[package]] name = "tmc-langs-r" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "log", "serde", @@ -2412,7 +2311,7 @@ dependencies = [ [[package]] name = "tmc-langs-util" version = "0.1.0" -source = "git+https://github.com/rage/tmc-langs-rust/?rev=12f021b#12f021ba4c823c9831ec6e63652fb7a11c67b69a" +source = "git+https://github.com/rage/tmc-langs-rust/?rev=74dcb3e#74dcb3efea76a16bebf5f6bc281b631f6012c0e5" dependencies = [ "fd-lock", "log", @@ -2428,9 +2327,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.5.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5" +checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" dependencies = [ "autocfg 1.0.1", "bytes", @@ -2439,6 +2338,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", + "winapi", ] [[package]] @@ -2454,9 +2354,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -2483,9 +2383,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if", "pin-project-lite", @@ -2494,19 +2394,13 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.18" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", ] -[[package]] -name = "treeline" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - [[package]] name = "try-lock" version = "0.2.3" @@ -2537,9 +2431,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicase" @@ -2552,33 +2446,30 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" @@ -2644,12 +2535,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.2+wasi-snapshot-preview1" @@ -2658,21 +2543,19 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if", - "serde", - "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", @@ -2685,9 +2568,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ "cfg-if", "js-sys", @@ -2697,9 +2580,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2707,9 +2590,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ "proc-macro2", "quote", @@ -2720,15 +2603,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", @@ -2754,10 +2637,10 @@ dependencies = [ ] [[package]] -name = "wepoll-sys" -version = "3.0.1" +name = "wepoll-ffi" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" dependencies = [ "cc", ] @@ -2802,12 +2685,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "xattr" version = "0.2.2" @@ -2819,9 +2696,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "yaml-rust" @@ -2834,9 +2711,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c83dc9b784d252127720168abd71ea82bf8c3d96b17dc565b5e2a02854f2b27" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" dependencies = [ "byteorder", "bzip2", @@ -2848,18 +2725,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.8.3+zstd.1.5.0" +version = "0.8.0+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea7094c7b4a58fbd738eb0d4a2fc7684a0e6949a31597e074ffe20a07cbc2bf" +checksum = "afab5e288c9e10bcd910b16ad82cb8028b74b09eccaa5ecd90621f99d3380735" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "4.1.0+zstd.1.5.0" +version = "4.0.0+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30375f78e185ca4c91930f42ea2c0162f9aa29737032501f93b79266d985ae7" +checksum = "81f02c0811d5455aa82c6bc400cffd8c882f3a2813f5e2245e2b264443305ab2" dependencies = [ "libc", "zstd-sys", @@ -2867,9 +2744,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.0+zstd.1.5.0" +version = "1.5.0+zstd.1.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" +checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index f8862ea..c764ceb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,11 @@ serde = "1" serde_json = "1" log = "0.4" dirs = "3" -# rev 12f021b = 0.19.0 -tmc-langs-util = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } -tmc-langs-framework = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } -tmc-langs = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } -tmc-client = { git = "https://github.com/rage/tmc-langs-rust/", rev = "12f021b" } +# rev 74dcb3e = 0.23.2 +tmc-langs-util = { git = "https://github.com/rage/tmc-langs-rust/", rev = "74dcb3e" } +tmc-langs-framework = { git = "https://github.com/rage/tmc-langs-rust/", rev = "74dcb3e" } +tmc-langs = { git = "https://github.com/rage/tmc-langs-rust/", rev = "74dcb3e" } +tmc-client = { git = "https://github.com/rage/tmc-langs-rust/", rev = "74dcb3e" } rpassword = "5.0.1" mockall = "0.9.0" indicatif = "0.15.0" diff --git a/src/commands/command_util.rs b/src/commands/command_util.rs index bdadda1..1afa84c 100644 --- a/src/commands/command_util.rs +++ b/src/commands/command_util.rs @@ -392,6 +392,7 @@ impl Client for ClientProduction { course_name: "test_course".to_string(), exercise_name: "test_exercise".to_string(), checksum: "test_checksum".to_string(), + hide_submission_results: false, }]); } match self.tmc_client.get_exercises_details(&exercise_ids) { diff --git a/src/updater.rs b/src/updater.rs index 7b2e322..37ee958 100644 --- a/src/updater.rs +++ b/src/updater.rs @@ -47,7 +47,6 @@ fn checktemp() { std::io::ErrorKind::PermissionDenied => { println!("Permission Denied! Restarting with administrator privileges..."); elevate("cleartemp".to_string()); - return; } _ => { println!("{:#?}", e); From 0aec935f917ffca8f422b873f8793980355cbf8f Mon Sep 17 00:00:00 2001 From: Jori Lampi Date: Tue, 23 Nov 2021 15:39:26 +0200 Subject: [PATCH 3/3] Small fixes --- src/commands/command_util.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/commands/command_util.rs b/src/commands/command_util.rs index 1afa84c..e6d424d 100644 --- a/src/commands/command_util.rs +++ b/src/commands/command_util.rs @@ -4,7 +4,6 @@ use std::path::Path; use std::path::PathBuf; use std::env; -use std::str::FromStr; use tmc_client::response::{ Course, CourseDetails, CourseExercise, ExercisesDetails, NewSubmission, Organization, SubmissionFinished, @@ -71,10 +70,12 @@ pub trait Client { ) -> Result; } +static SERVER_ADDRESS: &str = "https://tmc.mooc.fi"; + impl ClientProduction { pub fn new(test_mode: bool) -> Self { let (tmc_client, _credentials) = tmc_langs::init_tmc_client_with_credentials( - Url::from_str("https://tmc.mooc.fi").expect(""), + Url::parse(SERVER_ADDRESS).expect("Server address should always be correct."), PLUGIN, "1.0.0", ) @@ -168,8 +169,10 @@ impl Client for ClientProduction { if let Some(credentials) = get_credentials() { self.tmc_client.set_token(credentials.token()); + Ok(()) + } else { + Err("No login found. You need to be logged in to use this command".to_string()) } - Err("No login found. You need to be logged in to use this command".to_string()) } fn try_login(&mut self, username: String, password: String) -> Result {