From fb21d45baaedd43c8c56610262e84449f89eadd2 Mon Sep 17 00:00:00 2001 From: Tom Solberg Date: Thu, 31 Oct 2024 16:29:16 +0100 Subject: [PATCH] bump dependencies as needed (#59) Doing as few upgrades as possible and fixing deny to use version 2 advisories. --- .cargo/config.toml | 1 - CHANGELOG.md | 3 + Cargo.lock | 208 ++++++++++++--------- Cargo.toml | 8 +- benchmarks/perf-test/src/helpers.rs | 4 - crates/cervo-asset/src/lib.rs | 2 +- crates/cervo-asset/tests/asset-data.rs | 4 - crates/cervo-asset/tests/infer-simple.rs | 4 - crates/cervo-asset/tests/to-nnef.rs | 4 - crates/cervo-cli/src/commands.rs | 5 - crates/cervo-cli/src/commands/api.rs | 4 - crates/cervo-cli/src/commands/describe.rs | 4 - crates/cervo-cli/src/commands/package.rs | 4 - crates/cervo-cli/src/commands/to_nnef.rs | 3 - crates/cervo-core/src/inferer/helpers.rs | 4 - crates/cervo-core/src/inferer/memoizing.rs | 2 +- crates/cervo-core/src/model_api.rs | 4 - crates/cervo-nnef/tests/infer-simple.rs | 3 - crates/cervo-nnef/tests/load-complex.rs | 4 - crates/cervo-onnx/tests/infer-simple.rs | 4 - crates/cervo-onnx/tests/load-complex.rs | 4 - crates/cervo-onnx/tests/to-nnef.rs | 4 - crates/cervo-runtime/src/error.rs | 3 - crates/cervo-runtime/src/runtime.rs | 4 - crates/cervo-runtime/src/state.rs | 4 - crates/cervo-runtime/src/timing.rs | 5 - deny.toml | 36 +--- 27 files changed, 138 insertions(+), 201 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 8c27f09..f49b38b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -46,7 +46,6 @@ rustflags = [ "-Wclippy::match_wild_err_arm", "-Wclippy::match_wildcard_for_single_variants", "-Wclippy::mem_forget", - "-Wclippy::mismatched_target_os", "-Wclippy::missing_enforced_import_renames", "-Wclippy::mut_mut", "-Wclippy::mutex_integer", diff --git a/CHANGELOG.md b/CHANGELOG.md index d3d3c88..58d6e78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] - ReleaseDate +- Upgrade `time` to solve incompatibility with Rust 1.80.0 +- Add upper bound for tract at 0.21.6 due to breaking upstream change + ## [0.6.0] - 2024-02-12 - Upgrade to `perchance` v0.5 - Upgrade `tract` to 0.21.0 diff --git a/Cargo.lock b/Cargo.lock index 21a7d33..91db4b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,55 @@ dependencies = [ "memchr", ] +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.69" @@ -182,40 +231,49 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.1.8" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.8" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.3.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" -dependencies = [ - "os_str_bytes", -] +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "cpufeatures" @@ -294,6 +352,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive-new" version = "0.5.9" @@ -422,9 +489,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -435,12 +502,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "instant" version = "0.1.12" @@ -461,16 +522,10 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.4" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.3", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -702,6 +757,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.45" @@ -728,7 +789,7 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -747,12 +808,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "overload" version = "0.1.1" @@ -848,6 +903,12 @@ dependencies = [ "sha2", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -863,30 +924,6 @@ dependencies = [ "num-integer", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -1107,22 +1144,22 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.154" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cdd151213925e7f1ab45a9bbfb129316bd00799784b174b7cc7bcd16961c49e" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.154" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc80d722935453bcafdc2c9a73cd6fac4dc1938f0346035d84bf99fa9e33217" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -1176,9 +1213,9 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" @@ -1226,15 +1263,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.39" @@ -1267,11 +1295,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -1279,16 +1310,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -1513,6 +1545,12 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "valuable" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 14f7b4a..8961d2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ exclude = [ "benchmarks/perf-test" ] resolver = "2" [workspace.dependencies] -tract-core = { version = "0.21" } -tract-hir = { version = "0.21" } -tract-nnef = { version = "0.21" } -tract-onnx = { version = "0.21" } +tract-core = { version = "0.21,<0.21.6" } +tract-hir = { version = "0.21,<0.21.6" } +tract-nnef = { version = "0.21,<0.21.6" } +tract-onnx = { version = "0.21,<0.21.6" } diff --git a/benchmarks/perf-test/src/helpers.rs b/benchmarks/perf-test/src/helpers.rs index e7c08c2..54155cd 100644 --- a/benchmarks/perf-test/src/helpers.rs +++ b/benchmarks/perf-test/src/helpers.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 11 May 2022 -/*! - -*/ - use std::{collections::HashMap, fs::File, path::Path}; use cervo_core::prelude::State; diff --git a/crates/cervo-asset/src/lib.rs b/crates/cervo-asset/src/lib.rs index 7d9a93d..4b72958 100644 --- a/crates/cervo-asset/src/lib.rs +++ b/crates/cervo-asset/src/lib.rs @@ -30,7 +30,7 @@ pub const MAGIC: [u8; 4] = [b'C', b'R', b'V', b'O']; #[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(u8)] pub enum AssetKind { - /// Used for an asset containing ONNX ModelProto data. + /// Used for an asset containing ONNX `ModelProto` data. Onnx = 1, /// Used for an asset containing NNEF data. diff --git a/crates/cervo-asset/tests/asset-data.rs b/crates/cervo-asset/tests/asset-data.rs index 398493b..a0634a2 100644 --- a/crates/cervo-asset/tests/asset-data.rs +++ b/crates/cervo-asset/tests/asset-data.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 16 May 2022 -/*! - -*/ - use std::io::Read; use cervo_asset::{AssetData, AssetKind}; diff --git a/crates/cervo-asset/tests/infer-simple.rs b/crates/cervo-asset/tests/infer-simple.rs index ef92cf6..9507270 100644 --- a/crates/cervo-asset/tests/infer-simple.rs +++ b/crates/cervo-asset/tests/infer-simple.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_asset::AssetData; use cervo_core::prelude::{Inferer, InfererExt}; diff --git a/crates/cervo-asset/tests/to-nnef.rs b/crates/cervo-asset/tests/to-nnef.rs index 0fb23d7..77bb031 100644 --- a/crates/cervo-asset/tests/to-nnef.rs +++ b/crates/cervo-asset/tests/to-nnef.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_asset::AssetData; #[path = "./helpers.rs"] diff --git a/crates/cervo-cli/src/commands.rs b/crates/cervo-cli/src/commands.rs index 478ab0e..04cabf1 100644 --- a/crates/cervo-cli/src/commands.rs +++ b/crates/cervo-cli/src/commands.rs @@ -2,11 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 13 May 2022 -/*! - - -*/ - use anyhow::Result; use clap::Parser; diff --git a/crates/cervo-cli/src/commands/api.rs b/crates/cervo-cli/src/commands/api.rs index 933e541..6402f54 100644 --- a/crates/cervo-cli/src/commands/api.rs +++ b/crates/cervo-cli/src/commands/api.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 13 May 2022 -/*! - -*/ - use anyhow::{bail, Result}; use cervo::asset::AssetData; use cervo::core::prelude::Inferer; diff --git a/crates/cervo-cli/src/commands/describe.rs b/crates/cervo-cli/src/commands/describe.rs index 8ff33bf..c09c9ea 100644 --- a/crates/cervo-cli/src/commands/describe.rs +++ b/crates/cervo-cli/src/commands/describe.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 13 May 2022 -/*! - -*/ - use anyhow::{bail, Result}; use cervo::asset::AssetData; use clap::Parser; diff --git a/crates/cervo-cli/src/commands/package.rs b/crates/cervo-cli/src/commands/package.rs index 9c94081..2190c53 100644 --- a/crates/cervo-cli/src/commands/package.rs +++ b/crates/cervo-cli/src/commands/package.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 13 May 2022 -/*! - -*/ - use anyhow::{bail, Result}; use cervo::asset::{AssetData, AssetKind}; use clap::Parser; diff --git a/crates/cervo-cli/src/commands/to_nnef.rs b/crates/cervo-cli/src/commands/to_nnef.rs index 147215c..c5f32b8 100644 --- a/crates/cervo-cli/src/commands/to_nnef.rs +++ b/crates/cervo-cli/src/commands/to_nnef.rs @@ -2,9 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 13 May 2022 -/*! - -*/ use anyhow::{bail, Result}; use clap::Parser; use std::{fs::File, io::Write, path::PathBuf}; diff --git a/crates/cervo-core/src/inferer/helpers.rs b/crates/cervo-core/src/inferer/helpers.rs index 4616d7f..0de895d 100644 --- a/crates/cervo-core/src/inferer/helpers.rs +++ b/crates/cervo-core/src/inferer/helpers.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 12 May 2022 -/*! - -*/ - use tract_core::{ model::{TypedModel, TypedSimplePlan}, prelude::{Symbol, SymbolValues, ToDim}, diff --git a/crates/cervo-core/src/inferer/memoizing.rs b/crates/cervo-core/src/inferer/memoizing.rs index 19dc208..41377e4 100644 --- a/crates/cervo-core/src/inferer/memoizing.rs +++ b/crates/cervo-core/src/inferer/memoizing.rs @@ -40,7 +40,7 @@ use tract_hir::prelude::*; /// # Cons /// /// * For small amounts of data and large models the spikes can offset -/// amortized gains significantly +/// amortized gains significantly pub struct MemoizingDynamicInferer { symbol: Symbol, diff --git a/crates/cervo-core/src/model_api.rs b/crates/cervo-core/src/model_api.rs index a0c8f1f..7f172b2 100644 --- a/crates/cervo-core/src/model_api.rs +++ b/crates/cervo-core/src/model_api.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 11 May 2022 -/*! - -*/ - use tract_core::{model::TypedModel, tract_data::TractResult}; use tract_hir::{infer::Factoid, prelude::InferenceModel}; diff --git a/crates/cervo-nnef/tests/infer-simple.rs b/crates/cervo-nnef/tests/infer-simple.rs index 80a6401..28a6e5b 100644 --- a/crates/cervo-nnef/tests/infer-simple.rs +++ b/crates/cervo-nnef/tests/infer-simple.rs @@ -2,9 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ use cervo_core::prelude::{EpsilonInjector, Inferer, InfererExt}; #[path = "./helpers.rs"] diff --git a/crates/cervo-nnef/tests/load-complex.rs b/crates/cervo-nnef/tests/load-complex.rs index 07f13cc..275756b 100644 --- a/crates/cervo-nnef/tests/load-complex.rs +++ b/crates/cervo-nnef/tests/load-complex.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_core::prelude::Inferer; #[path = "./helpers.rs"] diff --git a/crates/cervo-onnx/tests/infer-simple.rs b/crates/cervo-onnx/tests/infer-simple.rs index 65c01fb..ad846e2 100644 --- a/crates/cervo-onnx/tests/infer-simple.rs +++ b/crates/cervo-onnx/tests/infer-simple.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_core::prelude::{EpsilonInjector, Inferer, InfererExt}; #[path = "./helpers.rs"] diff --git a/crates/cervo-onnx/tests/load-complex.rs b/crates/cervo-onnx/tests/load-complex.rs index e7a0b94..b5286b3 100644 --- a/crates/cervo-onnx/tests/load-complex.rs +++ b/crates/cervo-onnx/tests/load-complex.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_core::prelude::Inferer; #[path = "./helpers.rs"] diff --git a/crates/cervo-onnx/tests/to-nnef.rs b/crates/cervo-onnx/tests/to-nnef.rs index 5448d3c..ad18991 100644 --- a/crates/cervo-onnx/tests/to-nnef.rs +++ b/crates/cervo-onnx/tests/to-nnef.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Embark Studios AB, all rights reserved. // Created: 10 May 2022 -/*! - -*/ - use cervo_onnx::to_nnef; #[path = "./helpers.rs"] diff --git a/crates/cervo-runtime/src/error.rs b/crates/cervo-runtime/src/error.rs index 6eda28b..1ce5818 100644 --- a/crates/cervo-runtime/src/error.rs +++ b/crates/cervo-runtime/src/error.rs @@ -2,9 +2,6 @@ // Copyright © 2022, Tom Solberg, all rights reserved. // Created: 29 July 2022 -/*! - -*/ use crate::BrainId; use thiserror::Error; diff --git a/crates/cervo-runtime/src/runtime.rs b/crates/cervo-runtime/src/runtime.rs index 32d708c..d3618bc 100644 --- a/crates/cervo-runtime/src/runtime.rs +++ b/crates/cervo-runtime/src/runtime.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Tom Solberg, all rights reserved. // Created: 22 September 2022 -/*! - -*/ - mod ticket; use crate::{error::CervoError, state::ModelState, AgentId, BrainId}; diff --git a/crates/cervo-runtime/src/state.rs b/crates/cervo-runtime/src/state.rs index 3c67a6c..d311ff3 100644 --- a/crates/cervo-runtime/src/state.rs +++ b/crates/cervo-runtime/src/state.rs @@ -2,10 +2,6 @@ // Copyright © 2022, Tom Solberg, all rights reserved. // Created: 29 July 2022 -/*! - -*/ - use crate::{timing::TimingBucket, AgentId}; use cervo_core::prelude::{Batcher, Inferer, InfererExt, Response, State}; use std::{ diff --git a/crates/cervo-runtime/src/timing.rs b/crates/cervo-runtime/src/timing.rs index 68871ab..0632211 100644 --- a/crates/cervo-runtime/src/timing.rs +++ b/crates/cervo-runtime/src/timing.rs @@ -1,11 +1,6 @@ // Author: Tom Solberg // Copyright © 2022, Embark Studios, all rights reserved. // Created: 29 July 2022 - -/*! - -*/ - use std::time::Duration; pub(crate) struct TimingBucket { diff --git a/deny.toml b/deny.toml index 9f453f8..e720d31 100644 --- a/deny.toml +++ b/deny.toml @@ -17,6 +17,7 @@ # this list would mean the nix crate, as well as any of its exclusive # dependencies not shared by any other crates, would be ignored, as the target # list here is effectively saying which targets you are building for. +[graph] targets = [ # The triple can be any string, but only the target triples built in to # rustc (as of 1.40) can be checked against actual config expressions @@ -31,22 +32,16 @@ targets = [ # More documentation for the advisories section can be found here: # https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html [advisories] +version = 2 # The path where the advisory database is cloned/fetched into db-path = "~/.cargo/advisory-db" # The url(s) of the advisory databases to use db-urls = ["https://github.com/rustsec/advisory-db"] -# The lint level for security vulnerabilities -vulnerability = "deny" -# The lint level for unmaintained crates -unmaintained = "warn" -# The lint level for crates that have been yanked from their source registry -yanked = "warn" + # The lint level for crates with security notices. Note that as of # 2019-12-17 there are no security notice advisories in # https://github.com/rustsec/advisory-db -notice = "warn" -# A list of advisory IDs to ignore. Note that ignored advisories will still -# output a note when they are encountered. + ignore = [ #"RUSTSEC-0000-0000", ] @@ -65,7 +60,7 @@ ignore = [ # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html [licenses] # The lint level for crates which do not have a detectable license -unlicensed = "deny" + # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.11 short identifier (+ optional exception)]. @@ -75,26 +70,7 @@ allow = [ "Unicode-DFS-2016", #"Apache-2.0 WITH LLVM-exception", ] -# List of explicitly disallowed licenses -# See https://spdx.org/licenses/ for list of possible licenses -# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. -deny = [ - #"Nokia", -] -# Lint level for licenses considered copyleft -copyleft = "warn" -# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses -# * both - The license will be approved if it is both OSI-approved *AND* FSF -# * either - The license will be approved if it is either OSI-approved *OR* FSF -# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF -# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved -# * neither - This predicate is ignored and the default lint level is used -allow-osi-fsf-free = "neither" -# Lint level used when no other predicates are matched -# 1. License isn't in the allow or deny lists -# 2. License isn't copyleft -# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" -default = "deny" + # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the # canonical license text of a valid SPDX license file.