From 063623af3c8d49aff8ce89677fc49c64fffeb2b2 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 9 Nov 2022 19:47:06 +1000 Subject: [PATCH] Format .toml files with dprint --- Cargo.toml | 18 +++++----- pylib/rsbridge/Cargo.toml | 2 +- qt/bundle/Cargo.toml | 2 +- qt/bundle/mac/Cargo.toml | 10 +++--- qt/bundle/win/Cargo.toml | 2 +- rslib/Cargo.toml | 65 +++++++++++++++-------------------- rslib/i18n/Cargo.toml | 12 +++---- rslib/i18n_helpers/Cargo.toml | 4 +-- rslib/linkchecker/Cargo.toml | 29 ++++++---------- 9 files changed, 64 insertions(+), 80 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a62f7b293..2d4176712 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,14 +22,14 @@ rust_rules_workspace_name = "rules_rust" # need to update platforms/, BUILD.request.bazel and pylib/anki/BUILD.bazel as # well. targets = [ - "x86_64-apple-darwin", - "x86_64-apple-ios", - "x86_64-pc-windows-msvc", - "x86_64-unknown-linux-gnu", - "aarch64-apple-darwin", - "aarch64-apple-ios", - "aarch64-apple-ios-sim", - "aarch64-unknown-linux-gnu", + "x86_64-apple-darwin", + "x86_64-apple-ios", + "x86_64-pc-windows-msvc", + "x86_64-unknown-linux-gnu", + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "aarch64-unknown-linux-gnu", ] genmode = "Remote" default_gen_buildrs = true @@ -62,4 +62,4 @@ compile_data_attr = "glob([\"**/*.md\"])" buildrs_additional_environment_variables = { "PYO3_NO_PYTHON" = "1" } [patch.crates-io] -reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b658ddab125efba7b2bb4e2335" } +reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "7591444614de02b658ddab125efba7b2bb4e2335" } diff --git a/pylib/rsbridge/Cargo.toml b/pylib/rsbridge/Cargo.toml index 663ec947c..9fb727166 100644 --- a/pylib/rsbridge/Cargo.toml +++ b/pylib/rsbridge/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "rsbridge" version = "0.0.0" -edition = "2021" authors = ["Ankitects Pty Ltd and contributors "] +edition = "2021" license = "AGPL-3.0-or-later" description = "Anki's Rust library code Python bindings" diff --git a/qt/bundle/Cargo.toml b/qt/bundle/Cargo.toml index ee591b411..dcc63580f 100644 --- a/qt/bundle/Cargo.toml +++ b/qt/bundle/Cargo.toml @@ -5,7 +5,7 @@ build = "build.rs" edition = "2021" [target.'cfg(windows)'.dependencies] -winapi = {version = "0.3", features = ["wincon"]} +winapi = { version = "0.3", features = ["wincon"] } libc = "0.2" libc-stdhandle = "=0.1.0" diff --git a/qt/bundle/mac/Cargo.toml b/qt/bundle/mac/Cargo.toml index 97355bc25..674cc9999 100644 --- a/qt/bundle/mac/Cargo.toml +++ b/qt/bundle/mac/Cargo.toml @@ -1,15 +1,15 @@ [package] -edition = "2021" name = "makeapp" version = "0.1.0" authors = ["Ankitects Pty Ltd and contributors"] +edition = "2021" license = "AGPL-3.0-or-later" [dependencies] anyhow = "1.0.53" +apple-bundles = "0.6.0" glob = "0.3.0" -plist = "1.3.1" -walkdir = "2.3.2" -apple-bundles= "0.6.0" -tugger-file-manifest= "0.6.0" lazy_static = "1.4.0" +plist = "1.3.1" +tugger-file-manifest = "0.6.0" +walkdir = "2.3.2" diff --git a/qt/bundle/win/Cargo.toml b/qt/bundle/win/Cargo.toml index 757a3ad29..e0f7227b2 100644 --- a/qt/bundle/win/Cargo.toml +++ b/qt/bundle/win/Cargo.toml @@ -1,8 +1,8 @@ [package] -edition = "2021" name = "makeinstall" version = "0.1.0" authors = ["Ankitects Pty Ltd and contributors"] +edition = "2021" license = "AGPL-3.0-or-later" [dependencies] diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index f694e1132..80eac988f 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "anki" version = "0.0.0" -edition = "2021" authors = ["Ankitects Pty Ltd and contributors"] +build = "build/main.rs" +edition = "2021" license = "AGPL-3.0-or-later" description = "Anki's Rust library code" -build = "build/main.rs" [lib] name = "anki" @@ -30,78 +30,69 @@ env_logger = "0.9.1" tokio = { version = "1.21", features = ["macros"] } [dependencies] +anki_i18n = { path = "i18n" } + +csv = { git = "https://github.com/ankitects/rust-csv.git", rev = "1c9d3aab6f79a7d815c69f925a46a4590c115f90" } +pct-str = { git = "https://github.com/timothee-haudebourg/pct-str.git", rev = "4adccd8d4a222ab2672350a102f06ae832a0572d" } +reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "7591444614de02b658ddab125efba7b2bb4e2335", default-features = false, features = ["json","socks","stream","multipart", # the Bazel build scripts separate these out by platform + "native-tls","rustls-tls","rustls-tls-webpki-roots","rustls-tls-native-roots",] } + # pinned as any changes could invalidate sqlite indexes unicase = "=2.6.0" -tokio = { version = "1.21", features = ["fs", "rt-multi-thread"] } - -anki_i18n = { path="i18n" } - criterion = { version = "0.4.0", optional = true } -nom = "7.1.1" -proc-macro-nested = "0.1.7" -slog-term = "2.9.0" +ammonia = "3.2.1" +async-trait = "0.1.57" blake3 = "1.3.1" bytes = "1.2.1" chrono = "0.4.22" coarsetime = "0.1.22" +convert_case = "0.6.0" +dissimilar = "1.0.4" flate2 = "1.0.24" fluent = "0.16.0" fluent-bundle = "0.15.2" +fnv = "1.0.7" futures = "0.3.24" hex = "0.4.3" htmlescape = "0.3.1" +id_tree = "1.8.0" intl-memoizer = "0.5.1" itertools = "0.10.5" lazy_static = "1.4.0" -num_enum = "0.5.7" +nom = "7.1.1" num-integer = "0.1.45" +num_cpus = "1.13.1" +num_enum = "0.5.7" once_cell = "1.15.0" pin-project = "1.0.12" +proc-macro-nested = "0.1.7" prost = "0.11.0" +pulldown-cmark = "0.9.2" rand = "0.8.5" regex = "1.6.0" -reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b658ddab125efba7b2bb4e2335", default-features=false, features=[ - "json", - "socks", - "stream", - "multipart", - # the Bazel build scripts separate these out by platform - "native-tls", - "rustls-tls", - "rustls-tls-webpki-roots", - "rustls-tls-native-roots", -] } rusqlite = { version = "0.28.0", features = ["trace", "functions", "collation", "bundled"] } scopeguard = "1.1.0" serde = "1.0.145" +serde-aux = "4.0.0" serde_derive = "1.0.145" serde_json = "1.0.85" serde_repr = "0.1.9" serde_tuple = "0.5.0" -serde-aux = "4.0.0" sha1 = "0.6.0" slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_debug"] } slog-async = "2.7.0" slog-envlogger = "2.2.0" +slog-term = "2.9.0" +snafu = { version = "0.7.2", features = ["backtraces"] } +strum = { version = "0.24.1", features = ["derive"] } tempfile = "3.3.0" +tokio = { version = "1.21", features = ["fs", "rt-multi-thread"] } +tokio-util = { version = "0.7.4", features = ["io"] } unic-langid = { version = "0.9.0", features = ["macros"] } +unic-ucd-category = "0.9.0" unicode-normalization = "0.1.22" utime = "0.3.1" zip = { version = "0.6.2", default-features = false, features = ["deflate", "time"] } -async-trait = "0.1.57" -ammonia = "3.2.1" -pulldown-cmark = "0.9.2" -fnv = "1.0.7" -strum = { version = "0.24.1", features = ["derive"] } -tokio-util = { version = "0.7.4", features = ["io"] } -pct-str = { git="https://github.com/timothee-haudebourg/pct-str.git", rev="4adccd8d4a222ab2672350a102f06ae832a0572d" } -unic-ucd-category = "0.9.0" -id_tree = "1.8.0" -zstd = { version="0.11.2", features=["zstdmt"] } -num_cpus = "1.13.1" -csv = { git="https://github.com/ankitects/rust-csv.git", rev="1c9d3aab6f79a7d815c69f925a46a4590c115f90" } -dissimilar = "1.0.4" -snafu = { version = "0.7.2", features = ["backtraces"] } -convert_case = "0.6.0" +zstd = { version = "0.11.2", features = ["zstdmt"] } diff --git a/rslib/i18n/Cargo.toml b/rslib/i18n/Cargo.toml index 2a292573b..b47ae7cff 100644 --- a/rslib/i18n/Cargo.toml +++ b/rslib/i18n/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "anki_i18n" version = "0.0.0" -edition = "2021" authors = ["Ankitects Pty Ltd and contributors"] +build = "build/main.rs" +edition = "2021" license = "AGPL-3.0-or-later" description = "Anki's Rust library i18n code" -build = "build/main.rs" [lib] name = "anki_i18n" @@ -26,11 +26,11 @@ serde_json = "1.0.85" inflections = "1.1.1" [dependencies] -phf = { version = "0.11.1", features = ["macros"] } fluent = "0.16.0" +fluent-bundle = "0.15.2" +intl-memoizer = "0.5.1" num-format = "0.4.0" -unic-langid = { version = "0.9.0", features = ["macros"] } +phf = { version = "0.11.1", features = ["macros"] } serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.85" -intl-memoizer = "0.5.1" -fluent-bundle = "0.15.2" +unic-langid = { version = "0.9.0", features = ["macros"] } diff --git a/rslib/i18n_helpers/Cargo.toml b/rslib/i18n_helpers/Cargo.toml index f813b4b7c..804f0f06e 100644 --- a/rslib/i18n_helpers/Cargo.toml +++ b/rslib/i18n_helpers/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "anki_i18n_helpers" version = "0.0.0" -edition = "2021" authors = ["Ankitects Pty Ltd and contributors"] +edition = "2021" license = "AGPL-3.0-or-later" description = "Helpers for Anki's i18n system" @@ -13,8 +13,8 @@ path = "src/lib.rs" # After updating anything below, run ../cargo/update.py [dependencies] +fluent-syntax = "0.11.0" lazy_static = "1.4.0" regex = "1.6.0" serde_json = "1.0.85" walkdir = "2" -fluent-syntax = "0.11.0" diff --git a/rslib/linkchecker/Cargo.toml b/rslib/linkchecker/Cargo.toml index ec5188550..45b6ad97f 100644 --- a/rslib/linkchecker/Cargo.toml +++ b/rslib/linkchecker/Cargo.toml @@ -1,29 +1,22 @@ [package] name = "linkchecker" version = "0.0.0" -edition = "2021" authors = ["Ankitects Pty Ltd and contributors"] +edition = "2021" license = "AGPL-3.0-or-later" -#[[test]] -#name = "links" -#required-features = ["links"] +# [[test]] +# name = "links" +# required-features = ["links"] [dependencies] -linkcheck = { git = "https://github.com/ankitects/linkcheck.git", rev = "2f20798ce521cc594d510d4e417e76d5eac04d4b" } anki = { path = ".." } -tokio = { version = "1.21.1", features = ["full"] } -strum = { version = "0.24.1", features = ["derive"] } + +linkcheck = { git = "https://github.com/ankitects/linkcheck.git", rev = "2f20798ce521cc594d510d4e417e76d5eac04d4b" } +reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "7591444614de02b658ddab125efba7b2bb4e2335", default-features = false, features = ["json","socks","stream","multipart", # the Bazel build scripts separate these out by platform + "native-tls","rustls-tls","rustls-tls-webpki-roots","rustls-tls-native-roots",] } + futures = "0.3.24" -reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b658ddab125efba7b2bb4e2335", default-features=false, features=[ - "json", - "socks", - "stream", - "multipart", - # the Bazel build scripts separate these out by platform - "native-tls", - "rustls-tls", - "rustls-tls-webpki-roots", - "rustls-tls-native-roots", -] } itertools = "0.10.5" +strum = { version = "0.24.1", features = ["derive"] } +tokio = { version = "1.21.1", features = ["full"] }