From 884c3333ccd92d3bbb7e34082ddf238045672615 Mon Sep 17 00:00:00 2001 From: Scott Lamb Date: Wed, 27 Oct 2021 08:05:07 -0700 Subject: [PATCH] always use smallvec unions They only require Rust 1.51, and our minimum is 1.52 now. --- server/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index d7e0765..33d4dbc 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -9,7 +9,7 @@ license-file = "../LICENSE.txt" # The nightly feature is used within moonfire-nvr itself to gate the # benchmarks. Also pass it along to crates that can benefit from it. -nightly = ["db/nightly", "parking_lot/nightly", "smallvec/union"] +nightly = ["db/nightly", "parking_lot/nightly"] # The bundled feature includes bundled (aka statically linked) versions of # native libraries where possible. @@ -51,7 +51,7 @@ ring = "0.16.2" rusqlite = "0.26.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -smallvec = "1.0" +smallvec = { version = "1.7", features = ["union"] } structopt = { version = "0.3.13", default-features = false } sync_wrapper = "0.1.0" time = "0.1"