From d52a4489bb79be6d2351132542d5fe44f4beda5c Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Thu, 2 Apr 2020 03:18:27 +0900 Subject: [PATCH] Track Cargo.toml and Cargo.lock --- Cargo.lock | 121 ++++++++++++++------------------- Cargo.toml | 79 +++++++++++---------- examples/abc057-b-text-io.rs | 4 +- examples/abc073-d.rs | 2 +- examples/abc118-b-proconio.rs | 2 +- examples/abc118-b-text-io.rs | 3 +- examples/abc121-b-text-io.rs | 4 +- examples/abc129-f.rs | 2 +- examples/practice-a-text-io.rs | 4 +- examples/practice-b-text-io.rs | 3 +- 10 files changed, 103 insertions(+), 121 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c177ff..1467e0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,12 +11,11 @@ dependencies = [ [[package]] name = "alga" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f9468113d34781f6ca9d014d174c74b73de870f1e0e3ad32079bbab253b19" +checksum = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" dependencies = [ "approx", - "libm 0.1.4", "num-complex", "num-traits", ] @@ -48,10 +47,10 @@ dependencies = [ "getrandom", "im-rc", "indexmap", - "itertools", + "itertools 0.9.0", "itertools-num", "lazy_static", - "libm 0.2.1", + "libm", "maplit", "nalgebra", "ndarray", @@ -81,12 +80,6 @@ dependencies = [ "whiteread", ] -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - [[package]] name = "autocfg" version = "1.0.0" @@ -108,21 +101,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8cc868e96ba5c32ffae4d42bf2940ca7fca317dcef3f19b6d7de66b6885abff" -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -dependencies = [ - "ppv-lite86", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -163,9 +141,9 @@ dependencies = [ [[package]] name = "im-rc" -version = "14.1.0" +version = "14.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5135086ffe74654d797c02fd673c4046cdb7f552c98f1b1aa6851d6572f84f" +checksum = "303f7e6256d546e01979071417432425f15c1891fb309a5f2d724ee908fabd6e" dependencies = [ "bitmaps", "rand_core", @@ -177,11 +155,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" +checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" dependencies = [ - "autocfg 0.1.7", + "autocfg", ] [[package]] @@ -193,6 +171,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + [[package]] name = "itertools-num" version = "0.1.3" @@ -214,12 +201,6 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libm" version = "0.2.1" @@ -249,9 +230,9 @@ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "nalgebra" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abb021006c01b126a936a8dd1351e0720d83995f4fc942d0d426c654f990745" +checksum = "c6511777ed3da44b6a11e732a66a7d6274dfbbcd68ad968e64b778dcb829d94a" dependencies = [ "alga", "approx", @@ -271,7 +252,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b001fc2f5df269365fb77bd8396ce6b1f61c9848f7f088c25e57494bacc57b" dependencies = [ - "itertools", + "itertools 0.8.2", "matrixmultiply", "num-complex", "num-integer", @@ -295,11 +276,11 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f115de20ad793e857f76da2563ff4a09fbcfd6fe93cca0c5d996ab5f3ee38d" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-integer", "num-traits", ] @@ -310,7 +291,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-traits", ] @@ -320,7 +301,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c8b15b261814f992e33760b1fca9fe8b693d8a65299f20c9901688636cfb746" dependencies = [ - "proc-macro2 1.0.9", + "proc-macro2 1.0.10", "quote 1.0.3", "syn 1.0.17", ] @@ -331,7 +312,7 @@ version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-traits", ] @@ -341,18 +322,18 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-rational" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4dc79f9e6c81bef96148c8f6b8e72ad4541caa4a24373e900a36da07de03a3" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.0.0", + "autocfg", "num-bigint", "num-integer", "num-traits", @@ -364,7 +345,8 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" dependencies = [ - "autocfg 1.0.0", + "autocfg", + "libm", ] [[package]] @@ -409,18 +391,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" +checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" dependencies = [ "unicode-xid 0.2.0", ] [[package]] name = "proconio" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52d77f4e38736cf6e74cf5cb9bcc5da999d5823d01523395f25a9b80a81d517" +checksum = "3bed4f95f88d84bb8efd51dbc080d463e6ca953f05dfade2e24daf19dd861ccd" dependencies = [ "lazy_static", "proconio-derive", @@ -452,7 +434,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" dependencies = [ - "proc-macro2 1.0.9", + "proc-macro2 1.0.10", ] [[package]] @@ -471,11 +453,11 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "c2-chacha", + "ppv-lite86", "rand_core", ] @@ -532,9 +514,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "regex" -version = "1.3.3" +version = "1.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" +checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" dependencies = [ "aho-corasick", "memchr", @@ -550,12 +532,9 @@ checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" [[package]] name = "rustc-hash" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" -dependencies = [ - "byteorder", -] +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "sized-chunks" @@ -569,9 +548,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" +checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" [[package]] name = "superslice" @@ -596,16 +575,16 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" dependencies = [ - "proc-macro2 1.0.9", + "proc-macro2 1.0.10", "quote 1.0.3", "unicode-xid 0.2.0", ] [[package]] name = "text_io" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9658b61ebd1d2a40c276ba2335890b9eb6550b67458a6fbce2022e58c3350a50" +checksum = "6cb170b4f47dc48835fbc56259c12d8963e542b05a24be2e3a1f5a6c320fd2d4" [[package]] name = "thread_local" diff --git a/Cargo.toml b/Cargo.toml index e0d96c2..ea750e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,93 +15,100 @@ path = "src/main.rs" [dependencies] # AtCoder 2019年言語アップデート以降に使用できるクレート -# 多バイト長整数、分数、複素数など +# 各クレートの説明 +# https://github.com/rust-lang-ja/atcoder-rust-resources/wiki/2020-Update + +# 数値型の抽象化、多倍長整数、複素数、分数、及び整数型の拡張 num = "=0.2.1" -num-bigint = "=0.2.5" +num-bigint = "=0.2.6" num-complex = "=0.2.4" num-integer = "=0.1.42" num-iter = "=0.1.40" -num-rational = "=0.2.3" +num-rational = "=0.2.4" num-traits = "=0.2.11" -# `num-traits`用のderive macros + +# `num-traits`の自動実装 num-derive = "=0.3.0" -# 多次元配列 +# NumPyの`ndarray`のような多次元配列 ndarray = "=0.13.0" # 線形代数 -nalgebra = "=0.19.0" -alga = "=0.9.2" +nalgebra = "=0.20.0" + +# (線形)代数の抽象化 +alga = "=0.9.3" # libmのRust実装 libm = "=0.2.1" -# RNG 疑似乱数生成器 (randファミリー) +# 乱数 rand = { version = "=0.7.3", features = ["small_rng"] } getrandom = "=0.1.14" -rand_chacha = "=0.2.1" +rand_chacha = "=0.2.2" rand_core = "=0.5.1" rand_hc = "=0.2.0" rand_pcg = "=0.2.1" -# 乱数分布 + +# 乱数の分布の追加 rand_distr = "=0.2.2" # グラフ petgraph = "=0.5.0" # 挿入順を保持するhash table -indexmap = "=1.3.0" +indexmap = "=1.3.2" # 正規表現 -regex = "=1.3.3" +regex = "=1.3.6" # staticアイテムの遅延初期化 lazy_static = "=1.4.0" -# f64のOrd/Eq実装 +# `NotNan`, `OrderedFloat` ordered-float = "=1.0.2" -# 英数字などのASCII文字専用の文字列。文字にインデックスでアクセスしたり -# substringを簡単に作ったりできる +# ASCII文字列 ascii = "=1.0.0" -# Permutation生成。C++のnext_permutationに相当する機能を提供 +# permutation permutohedron = "=0.2.4" -# スライスの強化。C++のlower_bound, upper_boundに相当する機能を提供 +# スライスの拡張 superslice = "=1.0.0" -# イテレータの強化 -itertools = "=0.8.2" +# イテレータの拡張 +itertools = "=0.9.0" + +# イテレータの拡張（一次元累積和と浮動小数点数の等差数列） itertools-num = "=0.1.3" -# `hashmap!`, `hashset!`, `btreemap!`, `btreeset!` +# `BTreeMap`, `BTreeSet`, `HashMap`, `HashSet`のリテラル用マクロ maplit = "=1.0.2" # 即席enum `Either` either = "=1.5.3" -# 標準ライブラリのVecやHashMapに対応する永続データ構造 -# 永続データ構造は関数型言語によく見られるデータ構造で、要素を更新しても、そのデータ構造の -# 以前のバージョンにアクセスできる。（更新の度に差分が記録されていくイメージ） -im-rc = "=14.1.0" +# `BTreeMap`, `BTreeSet`, `HashMap`, `HashSet`, `Vec`の永続データ構造版 +im-rc = "=14.3.0" -# 可変長bit set。 +# 可変長bit set fixedbitset = "=0.2.0" + +# 可変長bit set bitset-fixed = "=0.1.0" -# 競技プログラミングの入出力サポート -proconio = { version = "=0.3.4", features = ["derive"] } -text_io = "=0.1.7" -whiteread = "=0.5.0" +# 競技プログラミングの入出力サポートその1 +proconio = { version = "=0.3.6", features = ["derive"] } -# 高速なハッシュ関数 -rustc-hash = "=1.0.1" +# 競技プログラミングの入出力サポートその2 +text_io = "=0.1.8" -# 固定配列上のベクタ。ヒープ領域でなくスタック領域にアロケートされるので高速かもしれない -smallvec = "=1.1.0" +# 競技プログラミングの入出力サポートその3 +whiteread = "=0.5.0" -# --------------------------------------------------------------------- +# 高速なハッシュ関数 +rustc-hash = "=1.1.0" -[dev-dependencies] -# cli_test_dir = "0.1" +# ある長さまでは要素を「直に」持つ可変長配列 +smallvec = "=1.2.0" diff --git a/examples/abc057-b-text-io.rs b/examples/abc057-b-text-io.rs index 2f22337..e46bfe2 100644 --- a/examples/abc057-b-text-io.rs +++ b/examples/abc057-b-text-io.rs @@ -1,8 +1,6 @@ // https://atcoder.jp/contests/abc057/tasks/abc057_b -#![allow(clippy::many_single_char_names, clippy::try_err)] - -use text_io::{read, try_read, try_scan}; +use text_io::read; fn main() { let n: usize = read!(); diff --git a/examples/abc073-d.rs b/examples/abc073-d.rs index 6a7cd53..02d94aa 100644 --- a/examples/abc073-d.rs +++ b/examples/abc073-d.rs @@ -13,7 +13,7 @@ use std::ops::Sub; fn main() { input! { - _n: usize, // `proconio` does not accept `_` as a variable name until v0.3.5. + _: usize, m: usize, r: usize, rs: [NodeIndex1; r], diff --git a/examples/abc118-b-proconio.rs b/examples/abc118-b-proconio.rs index a50e96b..c00d359 100644 --- a/examples/abc118-b-proconio.rs +++ b/examples/abc118-b-proconio.rs @@ -8,7 +8,7 @@ use std::ops::{BitAnd, BitOr}; fn main() { input! { n: usize, - _m: usize, // `proconio` does not accept `_` as a variable name until v0.3.5. + _: usize, a: [[Usize1]; n], } diff --git a/examples/abc118-b-text-io.rs b/examples/abc118-b-text-io.rs index 2cef31d..66c5958 100644 --- a/examples/abc118-b-text-io.rs +++ b/examples/abc118-b-text-io.rs @@ -1,10 +1,9 @@ // https://atcoder.jp/contests/abc118/tasks/abc118_b -use text_io::{read, try_read, try_scan}; +use text_io::read; use std::ops::{BitAnd, BitOr}; -#[allow(clippy::try_err)] fn main() { let (n, _): (usize, usize) = (read!(), read!()); let a = (0..n) diff --git a/examples/abc121-b-text-io.rs b/examples/abc121-b-text-io.rs index 3c7ab2d..81effa6 100644 --- a/examples/abc121-b-text-io.rs +++ b/examples/abc121-b-text-io.rs @@ -1,8 +1,8 @@ // https://atcoder.jp/contests/abc121/tasks/abc121_b -use text_io::{read, try_read, try_scan}; +use text_io::read; -#[allow(clippy::many_single_char_names, clippy::try_err)] +#[allow(clippy::many_single_char_names)] fn main() { let (n, m, c): (usize, usize, i32) = (read!(), read!(), read!()); let b = (0..m).map(|_| read!()).collect::>(); diff --git a/examples/abc129-f.rs b/examples/abc129-f.rs index d6d8043..32afa80 100644 --- a/examples/abc129-f.rs +++ b/examples/abc129-f.rs @@ -16,7 +16,7 @@ fn main() { l: u64, a: u64, b: u64, - _m: Mod, // `proconio` does not accept `_` as a variable name until v0.3.5. + _: Mod, } let count = |d| -> _ { diff --git a/examples/practice-a-text-io.rs b/examples/practice-a-text-io.rs index cc39bde..3dfb47a 100644 --- a/examples/practice-a-text-io.rs +++ b/examples/practice-a-text-io.rs @@ -1,8 +1,8 @@ // https://atcoder.jp/contests/practice/tasks/practice_1 -use text_io::{read, try_read, try_scan}; +use text_io::read; -#[allow(clippy::many_single_char_names, clippy::try_err)] +#[allow(clippy::many_single_char_names)] fn main() { let (a, b, c, s): (u32, u32, u32, String) = (read!(), read!(), read!(), read!()); diff --git a/examples/practice-b-text-io.rs b/examples/practice-b-text-io.rs index df3960e..d3b2514 100644 --- a/examples/practice-b-text-io.rs +++ b/examples/practice-b-text-io.rs @@ -1,11 +1,10 @@ // https://atcoder.jp/contests/practice/tasks/practice_2 use maplit::hashset; -use text_io::{read, try_read, try_scan}; +use text_io::read; use std::{io, str}; -#[allow(clippy::try_err)] fn main() { fn read_line() -> String { let mut input = "".to_owned();