Skip to content

Commit

Permalink
Merge #113
Browse files Browse the repository at this point in the history
113: Update deps r=MikailBag a=MikailBag



Co-authored-by: Mikail Bagishov <bagishov.mikail@yandex.ru>
  • Loading branch information
bors[bot] and MikailBag committed Nov 27, 2019
2 parents ae02452 + 3a60fed commit a335dc9
Show file tree
Hide file tree
Showing 25 changed files with 441 additions and 363 deletions.
638 changes: 358 additions & 280 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/all/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ frontend-engine = {path = "../frontend-engine"}

[dev-dependencies]
reqwest = "0.9.22"
serde_json = "1.0.41"
base64 = "0.10.1"
serde_json = "1.0.42"
base64 = "0.11.0"
8 changes: 4 additions & 4 deletions src/cfg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
serde = { version = "1.0.101", features = ["derive"] }
serde_derive = "1.0.101"
toml = "0.5.3"
serde = { version = "1.0.103", features = ["derive"] }
serde_derive = "1.0.103"
toml = "0.5.5"
pom = {path = "../pom"}
serde_json = "1.0.41"
serde_json = "1.0.42"
2 changes: 1 addition & 1 deletion src/cleanup/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
structopt = "0.3.3"
structopt = "0.3.5"
libc = "0.2.65"
nix = "0.15.0"
12 changes: 6 additions & 6 deletions src/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ description = "JJS CLI client"

[dependencies]
frontend-api = {path = "../frontend-api"}
structopt = "0.3.3"
base64 = "0.10.1"
structopt = "0.3.5"
base64 = "0.11.0"
slog = "2.5.2"
serde_json = "1.0.41"
serde_json = "1.0.42"
graphql_client = "0.8.0"
serde = "1.0.101"
serde = "1.0.103"
slog-envlogger = "2.2.0"
slog-stdlog = "4.0.0"
slog-term = "2.4.1"
slog-scope = "4.2.0"
slog-term = "2.4.2"
slog-scope = "4.3.0"
6 changes: 3 additions & 3 deletions src/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2018"

[dependencies]
diesel = { version = "1.4.3", features = ["postgres", "extras", "uuid", "uuidv07"] }
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
uuid = { version = "0.7.4", features = ["serde", "v4"] }
r2d2 = "0.8.6"
r2d2 = "0.8.7"
invoker-api = {path = "../invoker-api"}
bincode = "1.2.0"
anyhow = "1.0.22"
anyhow = "1.0.23"
10 changes: 5 additions & 5 deletions src/deploy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ name = "make"
path = "bin/make.rs"

[dependencies]
structopt = "0.3.3"
console = "0.9.0"
serde_json = "1.0.41"
structopt = "0.3.5"
console = "0.9.1"
serde_json = "1.0.42"
fs_extra = "1.1.0"
filetime = "0.2.7"
filetime = "0.2.8"
tar = "0.4.26"
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
shell-escape = "0.1.4"
tera = "0.11.20"
util = {path = "../util"}
6 changes: 3 additions & 3 deletions src/devtool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
structopt = "0.3.3"
serde = { version = "1.0.101", features = ["derive"] }
structopt = "0.3.5"
serde = { version = "1.0.103", features = ["derive"] }
log = "0.4.8"
env_logger = "0.7.1"
ignore = "0.4.10"
toml = "0.5.3"
toml = "0.5.5"
atty = "0.2.13"
util = {path = "../util"}
lazy_static = "1.4.0"
2 changes: 1 addition & 1 deletion src/frontend-api-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ proc-macro = true

[dependencies]
quote = "1.0.2"
syn = "1.0.5"
syn = "1.0.8"
proc-macro2 = "1.0.6"
6 changes: 3 additions & 3 deletions src/frontend-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ edition = "2018"

[dependencies]
reqwest = "0.9.22"
serde = "1.0.101"
serde = "1.0.103"
graphql_client = "0.8.0"
frontend-api-derive = {path = "../frontend-api-derive"}
serde_json = "1.0.41"
snafu = "0.5.0"
serde_json = "1.0.42"
snafu = "0.6.0"

[build-dependencies]
frontend-engine = {path = "../frontend-engine"}
18 changes: 9 additions & 9 deletions src/frontend-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ digest = "0.8.1"
db = {path = "../db"}
rand = "0.7.2"
slog = "2.5.2"
juniper = "0.14.0"
juniper = "0.14.1"
uuid = "0.7.4"
rocket = "0.4.2"
serde = "1.0.101"
serde = "1.0.103"
sha3 = "0.8.2"
rand_chacha = "0.2.1"
cfg = {path = "../cfg"}
base64 = "0.10.1"
base64 = "0.11.0"
constant_time_eq = "0.1.4"
libc = "0.2.65"
serde_json = "1.0.41"
serde_json = "1.0.42"
branca = "0.9.0"
juniper_rocket = "0.5.0"
juniper_rocket = "0.5.1"
backtrace = "0.3.40"
snafu = "0.5.0"
snafu = "0.6.0"
ranker = {path = "../ranker"}
util = {path = "../util"}
slog-scope = "4.2.0"
anyhow = "1.0.22"
slog-scope = "4.3.0"
anyhow = "1.0.23"
invoker-api = {path = "../invoker-api"}
rocket_contrib = "0.4.2"
my_internet_ip = "0.1.1"

[dev-dependencies]
toml = "0.5.3"
toml = "0.5.5"
setup = {path = "../setup"}
4 changes: 2 additions & 2 deletions src/frontend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ slog = "2.5.2"
cfg = {path = "../cfg"}
db = {path = "../db"}
dotenv = "0.15.0"
slog-term = "2.4.1"
slog-term = "2.4.2"
util = {path = "../util"}
slog-scope = "4.2.0"
slog-scope = "4.3.0"
4 changes: 2 additions & 2 deletions src/invoker-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
strum = "0.16.0"
strum_macros = "0.16.0"
strum_macros = "0.16.0"
20 changes: 10 additions & 10 deletions src/invoker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ edition = "2018"
[dependencies]
minion = {path = "../minion"}
cfg = {path ="../cfg"}
serde = { version = "1.0.101", features = ["derive"] }
serde_derive = "1.0.101"
serde_json = "1.0.41"
serde = { version = "1.0.103", features = ["derive"] }
serde_derive = "1.0.103"
serde_json = "1.0.42"
db = {path = "../db"}
dotenv = "0.15.0"
slog = { version = "2.5.2", features = ["max_level_trace"] }
slog-term = "2.4.1"
slog-term = "2.4.2"
ctrlc = { version = "3.1.3", features = ["termination"] }
aho-corasick = "0.7.6"
invoker-api = {path = "../invoker-api"}
Expand All @@ -24,17 +24,17 @@ nix = "0.15.0"
memchr = "2.2.1"
strum = "0.16.0"
strum_macros = "0.16.0"
chrono = "0.4.9"
color-backtrace = { version = "0.2.3", optional = true }
chrono = "0.4.10"
color-backtrace = { version = "0.3.0", optional = true }
tempfile = "3.1.0"
fs_extra = "1.1.0"
atty = "0.2.13"
base64 = "0.10.1"
base64 = "0.11.0"
bitflags = "1.2.1"
util = {path = "../util"}
slog-scope = "4.2.0"
anyhow = "1.0.18"
thiserror = "1.0.4"
slog-scope = "4.3.0"
anyhow = "1.0.23"
thiserror = "1.0.6"
reqwest = "0.9.22"

[features]
Expand Down
4 changes: 2 additions & 2 deletions src/minion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ edition = "2018"

[dependencies]
minion = {path = "../minion"}
structopt = "0.3.3"
structopt = "0.3.5"
human-panic = { version = "1.0.1", optional = true }
cfg-if = "0.1.10"
chrono = { version = "0.4.9", features = ["serde"] }
chrono = { version = "0.4.10", features = ["serde"] }

[features]
human_panic = ["human-panic"]
2 changes: 1 addition & 1 deletion src/minion-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ crate-type = ["cdylib", "staticlib"]
minion = {path = "../minion"}

[build-dependencies]
cbindgen = { version = "0.9.1", default-features = false }
cbindgen = { version = "0.10.0", default-features = false }
12 changes: 6 additions & 6 deletions src/minion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ libc= "0.2.65"
errno= "0.2.4"
rand = "0.7.2"
cfg-if = "0.1.10"
serde = { version = "1.0.101", features = ["derive"] }
serde_json = "1.0.41"
serde = { version = "1.0.103", features = ["derive"] }
serde_json = "1.0.42"
tiny-nix-ipc = { git = "https://github.com/myfreeweb/tiny-nix-ipc", features = ["ser_json", "zero_copy"] }
procfs = "0.6.0"
procfs = "0.7.4"
nix = "0.15.0"
downcast-rs = "1.1.0"
snafu = { version = "0.5.0", features = ["rust_1_30"] }
base64 = "0.10.1"
downcast-rs = "1.1.1"
snafu = "0.6.0"
base64 = "0.11.0"
backtrace = "0.3.40"
2 changes: 1 addition & 1 deletion src/minion/src/linux/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub fn check() -> Option<String> {
return Some(format!("Running with uid={} instead of 0", uid));
}

let cap_info = match procfs::Process::myself()
let cap_info = match procfs::process::Process::myself()
.and_then(|p| p.status())
.map(|st| st.capeff)
{
Expand Down
2 changes: 1 addition & 1 deletion src/pom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ edition = "2018"
description = "problems&contests object model (shared between invoker and tt)"

[dependencies]
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
14 changes: 7 additions & 7 deletions src/ppc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ PPC is tool for prepararing problems and contests
"""

[dependencies]
structopt = "0.3.3"
serde = { version = "1.0.101", features = ["derive"] }
toml = "0.5.3"
snafu = "0.5.0"
structopt = "0.3.5"
serde = { version = "1.0.103", features = ["derive"] }
toml = "0.5.5"
snafu = "0.6.0"
glob = "0.3.0"
libc = "0.2.65"
pom = {path = "../pom"}
serde_json = "1.0.41"
getrandom = "0.1.12"
serde_json = "1.0.42"
getrandom = "0.1.13"
hex = "0.4.0"
formatf = { git = "https://github.com/mikailbag/formatf" }
roxmltree = "0.7.1"
roxmltree = "0.7.3"
2 changes: 1 addition & 1 deletion src/ranker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }

[dev-dependencies]
pretty_assertions = "0.6.1"
Expand Down
4 changes: 2 additions & 2 deletions src/setup/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Simple utility to setup JJS on current host
[dependencies]
backtrace = "0.3.40"
fs_extra = "1.1.0"
structopt = "0.3.3"
structopt = "0.3.5"
util = {path = "../util"}
log = "0.4.8"
url = "2.1.0"
anyhow = "1.0.18"
anyhow = "1.0.23"
10 changes: 5 additions & 5 deletions src/soft/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
structopt = "0.3.3"
serde_json = "1.0.41"
serde = {version = "1.0.101", features = ["derive"]}
anyhow = "1.0.12"
structopt = "0.3.5"
serde_json = "1.0.42"
serde = { version = "1.0.103", features = ["derive"] }
anyhow = "1.0.23"
util = {path = "../util"}
toml = "0.5.3"
toml = "0.5.5"
copy-ln = { git = "https://github.com/mikailbag/copy-ln", branch = "master" }
tempfile = "3.1.0"
8 changes: 4 additions & 4 deletions src/userlist/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ authors = ["Mikail Bagishov <bagishov.mikail@yandex.ru>"]
edition = "2018"

[dependencies]
structopt = "0.3.3"
snafu = "0.5.0"
structopt = "0.3.5"
snafu = "0.6.0"
frontend-api = {path = "../frontend-api"}
base64 = "0.10.1"
base64 = "0.11.0"
pest = "2.1.2"
pest_derive = "2.1.0"
graphql_client = "0.8.0"
reqwest = "0.9.22"
serde = { version = "1.0.101", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
uuid = "0.7.4"
4 changes: 2 additions & 2 deletions src/util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ libsystemd = "0.1.0"
log = "0.4.8"
atty = "0.2.13"
slog = "2.5.2"
slog-term = "2.4.1"
slog-term = "2.4.2"
slog-envlogger = "2.2.0"
slog-scope = "4.2.0"
slog-scope = "4.3.0"
slog-stdlog = "4.0.0"
url = "2.1.0"

0 comments on commit a335dc9

Please sign in to comment.