From 104d64589db24187c56fd8c7b13fdd9202ecc120 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Apr 2023 15:31:12 -0400 Subject: [PATCH 1/5] Increment MSRV to 1.65 in every crate. --- crates/arti-bench/Cargo.toml | 2 +- crates/arti-client/Cargo.toml | 2 +- crates/arti-config/Cargo.toml | 2 +- crates/arti-hyper/Cargo.toml | 2 +- crates/arti-testing/Cargo.toml | 2 +- crates/arti/Cargo.toml | 2 +- crates/caret/Cargo.toml | 2 +- crates/fs-mistrust/Cargo.toml | 2 +- crates/retry-error/Cargo.toml | 2 +- crates/safelog/Cargo.toml | 2 +- crates/tor-async-utils/Cargo.toml | 2 +- crates/tor-basic-utils/Cargo.toml | 2 +- crates/tor-bytes/Cargo.toml | 2 +- crates/tor-cell/Cargo.toml | 2 +- crates/tor-cert/Cargo.toml | 2 +- crates/tor-chanmgr/Cargo.toml | 2 +- crates/tor-checkable/Cargo.toml | 2 +- crates/tor-circmgr/Cargo.toml | 2 +- crates/tor-config/Cargo.toml | 2 +- crates/tor-congestion/Cargo.toml | 2 +- crates/tor-consdiff/Cargo.toml | 2 +- crates/tor-dirclient/Cargo.toml | 2 +- crates/tor-dirmgr/Cargo.toml | 2 +- crates/tor-error/Cargo.toml | 2 +- crates/tor-events/Cargo.toml | 2 +- crates/tor-guardmgr/Cargo.toml | 2 +- crates/tor-hsclient/Cargo.toml | 2 +- crates/tor-hscrypto/Cargo.toml | 2 +- crates/tor-hsservice/Cargo.toml | 2 +- crates/tor-linkspec/Cargo.toml | 2 +- crates/tor-llcrypto/Cargo.toml | 2 +- crates/tor-netdir/Cargo.toml | 2 +- crates/tor-netdoc/Cargo.toml | 2 +- crates/tor-persist/Cargo.toml | 2 +- crates/tor-proto/Cargo.toml | 2 +- crates/tor-protover/Cargo.toml | 2 +- crates/tor-ptmgr/Cargo.toml | 2 +- crates/tor-rtcompat/Cargo.toml | 2 +- crates/tor-rtmock/Cargo.toml | 2 +- crates/tor-socksproto/Cargo.toml | 2 +- crates/tor-units/Cargo.toml | 2 +- maint/fixup-features/Cargo.toml | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/crates/arti-bench/Cargo.toml b/crates/arti-bench/Cargo.toml index 8af650346..4c3ca4cd4 100644 --- a/crates/arti-bench/Cargo.toml +++ b/crates/arti-bench/Cargo.toml @@ -2,7 +2,7 @@ name = "arti-bench" version = "0.8.3" edition = "2021" -rust-version = "1.60" +rust-version = "1.65" authors = ["The Tor Project, Inc.", "eta "] license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" diff --git a/crates/arti-client/Cargo.toml b/crates/arti-client/Cargo.toml index 0b9f5d4bf..d2c7dfb2d 100644 --- a/crates/arti-client/Cargo.toml +++ b/crates/arti-client/Cargo.toml @@ -3,7 +3,7 @@ name = "arti-client" version = "0.8.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Library for connecting to the Tor network as an anonymous client" diff --git a/crates/arti-config/Cargo.toml b/crates/arti-config/Cargo.toml index ae4ee6d3e..9578762b0 100644 --- a/crates/arti-config/Cargo.toml +++ b/crates/arti-config/Cargo.toml @@ -3,7 +3,7 @@ name = "arti-config" version = "0.5.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Removed crate. (Tools for configuration management in Arti)" diff --git a/crates/arti-hyper/Cargo.toml b/crates/arti-hyper/Cargo.toml index c73af7729..834c56bf7 100644 --- a/crates/arti-hyper/Cargo.toml +++ b/crates/arti-hyper/Cargo.toml @@ -3,7 +3,7 @@ name = "arti-hyper" version = "0.8.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Adapter for making anonymous http requests using the Tor network and hyper" diff --git a/crates/arti-testing/Cargo.toml b/crates/arti-testing/Cargo.toml index 9f2c7f4ff..8d705617e 100644 --- a/crates/arti-testing/Cargo.toml +++ b/crates/arti-testing/Cargo.toml @@ -3,7 +3,7 @@ name = "arti-testing" version = "0.8.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Tools for testing the Arti Tor implementation." diff --git a/crates/arti/Cargo.toml b/crates/arti/Cargo.toml index 90a472399..e2128bd2d 100644 --- a/crates/arti/Cargo.toml +++ b/crates/arti/Cargo.toml @@ -3,7 +3,7 @@ name = "arti" version = "1.1.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "A rust implementation of the Tor privacy tools." diff --git a/crates/caret/Cargo.toml b/crates/caret/Cargo.toml index 2b7426a2b..3530898a5 100644 --- a/crates/caret/Cargo.toml +++ b/crates/caret/Cargo.toml @@ -3,7 +3,7 @@ name = "caret" version = "0.3.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Macros for declaring non-exhaustive C-style enumerations, with named members" diff --git a/crates/fs-mistrust/Cargo.toml b/crates/fs-mistrust/Cargo.toml index d23deb785..a9797760f 100644 --- a/crates/fs-mistrust/Cargo.toml +++ b/crates/fs-mistrust/Cargo.toml @@ -9,7 +9,7 @@ description = "Ensure that files can only be read or written by trusted users" keywords = ["fs", "file", "permissions", "ownership", "privacy"] categories = ["filesystem"] repository = "https://gitlab.torproject.org/tpo/core/arti.git/" -rust-version = "1.60" +rust-version = "1.65" [features] default = ["walkdir", "anon_home"] diff --git a/crates/retry-error/Cargo.toml b/crates/retry-error/Cargo.toml index bb73da12a..84096cae5 100644 --- a/crates/retry-error/Cargo.toml +++ b/crates/retry-error/Cargo.toml @@ -3,7 +3,7 @@ name = "retry-error" version = "0.3.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "An error type for an operation that can fail more than once" diff --git a/crates/safelog/Cargo.toml b/crates/safelog/Cargo.toml index ae7d4c3e0..e7b541473 100644 --- a/crates/safelog/Cargo.toml +++ b/crates/safelog/Cargo.toml @@ -3,7 +3,7 @@ name = "safelog" version = "0.2.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Conditionally suppress confidential information from logs" diff --git a/crates/tor-async-utils/Cargo.toml b/crates/tor-async-utils/Cargo.toml index b27ffbbc5..a695e8881 100644 --- a/crates/tor-async-utils/Cargo.toml +++ b/crates/tor-async-utils/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-async-utils" version = "0.0.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Async/futures helpers for use with Tor" diff --git a/crates/tor-basic-utils/Cargo.toml b/crates/tor-basic-utils/Cargo.toml index a0023df04..fb351bc6a 100644 --- a/crates/tor-basic-utils/Cargo.toml +++ b/crates/tor-basic-utils/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-basic-utils" version = "0.6.0" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "General helpers used by Tor" diff --git a/crates/tor-bytes/Cargo.toml b/crates/tor-bytes/Cargo.toml index 49b346a66..fd4657a11 100644 --- a/crates/tor-bytes/Cargo.toml +++ b/crates/tor-bytes/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-bytes" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Helpers for encoding and decoding byte-orientted data, as used by Tor" diff --git a/crates/tor-cell/Cargo.toml b/crates/tor-cell/Cargo.toml index e7558f631..b59ab5997 100644 --- a/crates/tor-cell/Cargo.toml +++ b/crates/tor-cell/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-cell" version = "0.9.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Encode and decode Tor cells and messages" diff --git a/crates/tor-cert/Cargo.toml b/crates/tor-cert/Cargo.toml index 9c4523b29..bf96670d7 100644 --- a/crates/tor-cert/Cargo.toml +++ b/crates/tor-cert/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-cert" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Non-standard certificate formats used by Tor" diff --git a/crates/tor-chanmgr/Cargo.toml b/crates/tor-chanmgr/Cargo.toml index aafe9a0f3..0bb67b59d 100644 --- a/crates/tor-chanmgr/Cargo.toml +++ b/crates/tor-chanmgr/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-chanmgr" version = "0.8.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Manage a set of connections to the Tor network" diff --git a/crates/tor-checkable/Cargo.toml b/crates/tor-checkable/Cargo.toml index 9066bf8e5..5b84fdb44 100644 --- a/crates/tor-checkable/Cargo.toml +++ b/crates/tor-checkable/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-checkable" version = "0.4.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Types to ensure that signed or time-bound data is validated before use" diff --git a/crates/tor-circmgr/Cargo.toml b/crates/tor-circmgr/Cargo.toml index 3f39e6c88..c83301cf2 100644 --- a/crates/tor-circmgr/Cargo.toml +++ b/crates/tor-circmgr/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-circmgr" version = "0.7.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Manage a set of anonymous circuits over the Tor network" diff --git a/crates/tor-config/Cargo.toml b/crates/tor-config/Cargo.toml index c684aef84..9cf3647a4 100644 --- a/crates/tor-config/Cargo.toml +++ b/crates/tor-config/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-config" version = "0.8.0" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Low-level configuration for the Arti Tor implementation" diff --git a/crates/tor-congestion/Cargo.toml b/crates/tor-congestion/Cargo.toml index 516ede9e4..5dac03923 100644 --- a/crates/tor-congestion/Cargo.toml +++ b/crates/tor-congestion/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-congestion" version = "0.4.2" edition = "2021" authors = ["The Tor Project, Inc.", "eta "] -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Implementations of Tor network congestion control algorithms" diff --git a/crates/tor-consdiff/Cargo.toml b/crates/tor-consdiff/Cargo.toml index 58fc6c527..e92b9deb1 100644 --- a/crates/tor-consdiff/Cargo.toml +++ b/crates/tor-consdiff/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-consdiff" version = "0.4.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Handle the consensus-diff format used in the Tor directory protocol" diff --git a/crates/tor-dirclient/Cargo.toml b/crates/tor-dirclient/Cargo.toml index 97a1b909c..8c810165d 100644 --- a/crates/tor-dirclient/Cargo.toml +++ b/crates/tor-dirclient/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-dirclient" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Downloads specific Tor network directory objects over the Tor network" diff --git a/crates/tor-dirmgr/Cargo.toml b/crates/tor-dirmgr/Cargo.toml index 01aefdc07..ae8f3fa7e 100644 --- a/crates/tor-dirmgr/Cargo.toml +++ b/crates/tor-dirmgr/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-dirmgr" version = "0.9.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Bootstrap and update an accurate Tor network directory" diff --git a/crates/tor-error/Cargo.toml b/crates/tor-error/Cargo.toml index cd2749faf..6dd18e22f 100644 --- a/crates/tor-error/Cargo.toml +++ b/crates/tor-error/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-error" version = "0.4.1" authors = ["Ian Jackson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Provides the unified type-erased error type returned by many (esp. high-level) Tor APIs." diff --git a/crates/tor-events/Cargo.toml b/crates/tor-events/Cargo.toml index 9a0343f48..2e969bd80 100644 --- a/crates/tor-events/Cargo.toml +++ b/crates/tor-events/Cargo.toml @@ -2,7 +2,7 @@ name = "tor-events" version = "0.4.1" edition = "2021" -rust-version = "1.60" +rust-version = "1.65" authors = ["The Tor Project, Inc.", "eta "] license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" diff --git a/crates/tor-guardmgr/Cargo.toml b/crates/tor-guardmgr/Cargo.toml index c38666167..dd7f8a26f 100644 --- a/crates/tor-guardmgr/Cargo.toml +++ b/crates/tor-guardmgr/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-guardmgr" version = "0.8.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Manage a set of guard relays for Tor network" diff --git a/crates/tor-hsclient/Cargo.toml b/crates/tor-hsclient/Cargo.toml index 69eede688..9b80f63fe 100644 --- a/crates/tor-hsclient/Cargo.toml +++ b/crates/tor-hsclient/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-hsclient" version = "0.1.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Arti's implementation of an onion service client" diff --git a/crates/tor-hscrypto/Cargo.toml b/crates/tor-hscrypto/Cargo.toml index b61093063..5047525d3 100644 --- a/crates/tor-hscrypto/Cargo.toml +++ b/crates/tor-hscrypto/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-hscrypto" version = "0.1.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Basic onion service cryptography types used by Aerti" diff --git a/crates/tor-hsservice/Cargo.toml b/crates/tor-hsservice/Cargo.toml index 1d2177a4a..336104829 100644 --- a/crates/tor-hsservice/Cargo.toml +++ b/crates/tor-hsservice/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-hsservice" version = "0.1.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Arti's implementation of an onion service provider" diff --git a/crates/tor-linkspec/Cargo.toml b/crates/tor-linkspec/Cargo.toml index 8121b1107..64fe5eeab 100644 --- a/crates/tor-linkspec/Cargo.toml +++ b/crates/tor-linkspec/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-linkspec" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Parts of the Tor protocol that indicate specific relays on the network" diff --git a/crates/tor-llcrypto/Cargo.toml b/crates/tor-llcrypto/Cargo.toml index b8cb5f022..6252342d0 100644 --- a/crates/tor-llcrypto/Cargo.toml +++ b/crates/tor-llcrypto/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-llcrypto" version = "0.4.4" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Low level cryptography wrappers used by Tor" diff --git a/crates/tor-netdir/Cargo.toml b/crates/tor-netdir/Cargo.toml index f05790fb3..63563889c 100644 --- a/crates/tor-netdir/Cargo.toml +++ b/crates/tor-netdir/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-netdir" version = "0.8.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Types to represent and use a Tor network directory" diff --git a/crates/tor-netdoc/Cargo.toml b/crates/tor-netdoc/Cargo.toml index b4bfb4bb7..fa4830adb 100644 --- a/crates/tor-netdoc/Cargo.toml +++ b/crates/tor-netdoc/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-netdoc" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Network document formats used with the Tor protocols." diff --git a/crates/tor-persist/Cargo.toml b/crates/tor-persist/Cargo.toml index b0d0bf604..c1c4ea38a 100644 --- a/crates/tor-persist/Cargo.toml +++ b/crates/tor-persist/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-persist" version = "0.6.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Persistent state for the Arti Tor implementation" diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml index b909b22dc..1e90b2fc4 100644 --- a/crates/tor-proto/Cargo.toml +++ b/crates/tor-proto/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-proto" version = "0.9.1" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Asynchronous client-side implementation of the central Tor network protocols" diff --git a/crates/tor-protover/Cargo.toml b/crates/tor-protover/Cargo.toml index aaf25d4cd..ceac9af60 100644 --- a/crates/tor-protover/Cargo.toml +++ b/crates/tor-protover/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-protover" version = "0.4.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Implementation for Tor's subprotocol versioning" diff --git a/crates/tor-ptmgr/Cargo.toml b/crates/tor-ptmgr/Cargo.toml index 2423ae5d3..08ba7b6f7 100644 --- a/crates/tor-ptmgr/Cargo.toml +++ b/crates/tor-ptmgr/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-ptmgr" version = "0.2.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Manage a set of pluggable transports to circumvent censorship" diff --git a/crates/tor-rtcompat/Cargo.toml b/crates/tor-rtcompat/Cargo.toml index 592bcefa5..119a850b2 100644 --- a/crates/tor-rtcompat/Cargo.toml +++ b/crates/tor-rtcompat/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-rtcompat" version = "0.8.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Compatibility layer for asynchronous runtimes, used by Tor" diff --git a/crates/tor-rtmock/Cargo.toml b/crates/tor-rtmock/Cargo.toml index 96c86aba3..aa9d84f6c 100644 --- a/crates/tor-rtmock/Cargo.toml +++ b/crates/tor-rtmock/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-rtmock" version = "0.7.2" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Testing mock support for tor-rtcomapt" diff --git a/crates/tor-socksproto/Cargo.toml b/crates/tor-socksproto/Cargo.toml index 4166befc0..78b3ffde9 100644 --- a/crates/tor-socksproto/Cargo.toml +++ b/crates/tor-socksproto/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-socksproto" version = "0.6.3" authors = ["The Tor Project, Inc.", "Nick Mathewson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Encode and decode the SOCKS protocol, as extended in Tor" diff --git a/crates/tor-units/Cargo.toml b/crates/tor-units/Cargo.toml index f506ce6b1..49caadbd7 100644 --- a/crates/tor-units/Cargo.toml +++ b/crates/tor-units/Cargo.toml @@ -3,7 +3,7 @@ name = "tor-units" version = "0.5.0" authors = ["Dennis Jackson "] edition = "2021" -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Provides macros for types which are constrained within a range, ensuring invalid values are unrepresentable." diff --git a/maint/fixup-features/Cargo.toml b/maint/fixup-features/Cargo.toml index 0a5efbdd6..85c3e3e81 100644 --- a/maint/fixup-features/Cargo.toml +++ b/maint/fixup-features/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" publish = false authors = ["The Tor Project, Inc.", "Nick Mathewson "] -rust-version = "1.60" +rust-version = "1.65" license = "MIT OR Apache-2.0" homepage = "https://gitlab.torproject.org/tpo/core/arti/-/wikis/home" description = "Tool used by arti to enforce certain properties in our Cargo features" From e26445b1b018ee924dd33b6d5eceaa4957da8baf Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Apr 2023 15:32:32 -0400 Subject: [PATCH 2/5] Use bool::then_some() as appropriate Now that we require a version of Rust that allows `b.then_some(v)`, clippy complains about our use of `b.then(|| v)`. --- crates/tor-config/src/cmdline.rs | 2 +- crates/tor-dirmgr/src/bridgedesc/bdtest.rs | 14 +++++++------- crates/tor-dirmgr/src/state.rs | 2 +- crates/tor-guardmgr/src/bridge/relay.rs | 2 +- crates/tor-guardmgr/src/skew.rs | 2 +- crates/tor-hsclient/src/isol_map.rs | 2 +- crates/tor-netdir/src/lib.rs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crates/tor-config/src/cmdline.rs b/crates/tor-config/src/cmdline.rs index 46ceed52e..e8dccdb2e 100644 --- a/crates/tor-config/src/cmdline.rs +++ b/crates/tor-config/src/cmdline.rs @@ -61,7 +61,7 @@ impl CmdLine { .and_then(|range| { let startline = linepos(range.start); let endline = linepos(range.end); - (startline == endline).then(|| startline) + (startline == endline).then_some(startline) }) .and_then(|pos| self.contents.get(pos)); diff --git a/crates/tor-dirmgr/src/bridgedesc/bdtest.rs b/crates/tor-dirmgr/src/bridgedesc/bdtest.rs index 7b59b3099..717e5e84f 100644 --- a/crates/tor-dirmgr/src/bridgedesc/bdtest.rs +++ b/crates/tor-dirmgr/src/bridgedesc/bdtest.rs @@ -198,14 +198,14 @@ where fn queues_are_empty(bdm: &Bdm) -> Option<()> { let state = bdm.mgr.lock_only(); - (state.running.is_empty() && state.queued.is_empty()).then(|| ()) + (state.running.is_empty() && state.queued.is_empty()).then_some(()) } fn in_results(bdm: &Bdm, bridge: &BridgeKey, wanted: Option>) -> Option<()> { let bridges = bdm.bridges(); let got = bridges.get(bridge); let got = got.map(|got| got.as_ref().map(|_| ()).map_err(|_| ())); - (got == wanted).then(|| ()) + (got == wanted).then_some(()) } async fn clear_and_re_request(bdm: &Bdm, events: &mut S, bridge: &BridgeKey) @@ -216,7 +216,7 @@ where bdm.set_bridges(&[]); stream_drain_until(3, events, || async { in_results(bdm, bridge, None) - .and_then(|()| bdm.mgr.lock_only().running.is_empty().then(|| ())) + .and_then(|()| bdm.mgr.lock_only().running.is_empty().then_some(())) }) .await; bdm.set_bridges(&[bridge.clone()]); @@ -280,7 +280,7 @@ async fn success() -> Result<(), anyhow::Error> { bridges .iter() .all(|b| bdm.bridges().contains_key(b)) - .then(|| ()) + .then_some(()) }) .await; @@ -299,7 +299,7 @@ async fn success() -> Result<(), anyhow::Error> { let () = stream_drain_until(13, &mut events, || async { bdm.check_consistency(Some(&bridges)); - (mock.mstate.lock().await.download_calls == NFAIL).then(|| ()) + (mock.mstate.lock().await.download_calls == NFAIL).then_some(()) }) .await; @@ -356,7 +356,7 @@ async fn success() -> Result<(), anyhow::Error> { // should produce a removed bridge event let () = stream_drain_until(1, &mut events, || async { bdm.check_consistency(Some(&bridges)); - (!bdm.bridges().contains_key(&removed)).then(|| ()) + (!bdm.bridges().contains_key(&removed)).then_some(()) }) .await; @@ -454,7 +454,7 @@ async fn cache() -> Result<(), anyhow::Error> { mock.sleep.advance(Duration::from_secs(20000)).await; stream_drain_until(3, &mut events, || async { - (mock.mstate.lock().await.download_calls > 0).then(|| ()) + (mock.mstate.lock().await.download_calls > 0).then_some(()) }) .await; diff --git a/crates/tor-dirmgr/src/state.rs b/crates/tor-dirmgr/src/state.rs index 0deaca822..3d7e90e82 100644 --- a/crates/tor-dirmgr/src/state.rs +++ b/crates/tor-dirmgr/src/state.rs @@ -968,7 +968,7 @@ impl DirState for GetMicrodescsState { } else { collected_microdescs .is_empty() - .then(move || NetDirChange::AddMicrodescs(collected_microdescs)) + .then_some(NetDirChange::AddMicrodescs(collected_microdescs)) } } _ => None, diff --git a/crates/tor-guardmgr/src/bridge/relay.rs b/crates/tor-guardmgr/src/bridge/relay.rs index 90f4a4ca8..2b3037718 100644 --- a/crates/tor-guardmgr/src/bridge/relay.rs +++ b/crates/tor-guardmgr/src/bridge/relay.rs @@ -73,7 +73,7 @@ impl<'a> BridgeRelay<'a> { /// If we have enough information about this relay to build a circuit through it, /// return a BridgeRelayWithDesc for it. pub fn as_relay_with_desc(&self) -> Option> { - self.desc.is_some().then(|| BridgeRelayWithDesc(self)) + self.desc.is_some().then_some(BridgeRelayWithDesc(self)) } } diff --git a/crates/tor-guardmgr/src/skew.rs b/crates/tor-guardmgr/src/skew.rs index 188666a0a..0e9480b6a 100644 --- a/crates/tor-guardmgr/src/skew.rs +++ b/crates/tor-guardmgr/src/skew.rs @@ -121,7 +121,7 @@ impl SkewEstimate { let min_observations = 8; let skews: Vec<_> = skews - .filter_map(|obs| obs.more_recent_than(cutoff).then(|| obs.skew)) + .filter_map(|obs| obs.more_recent_than(cutoff).then_some(obs.skew)) .collect(); if skews.len() < min_observations { return None; diff --git a/crates/tor-hsclient/src/isol_map.rs b/crates/tor-hsclient/src/isol_map.rs index 009b2d035..7111d0d72 100644 --- a/crates/tor-hsclient/src/isol_map.rs +++ b/crates/tor-hsclient/src/isol_map.rs @@ -133,7 +133,7 @@ where } = self.table.get(t_index) // should be Some, unless data structure corrupted, but don't panic here ?; - (t_k2 == k2).then(|| ())?; + (t_k2 == k2).then_some(())?; let new_isolation = t_isolation.join(&*isolation)?; Some((t_index, new_isolation)) }) { diff --git a/crates/tor-netdir/src/lib.rs b/crates/tor-netdir/src/lib.rs index dbffeffb0..2fc91b487 100644 --- a/crates/tor-netdir/src/lib.rs +++ b/crates/tor-netdir/src/lib.rs @@ -995,7 +995,7 @@ impl NetDir { fn all_hsdirs(&self) -> impl Iterator)> { self.c_relays().iter_enumerated().filter_map(|(rsidx, rs)| { let relay = self.relay_from_rs_and_rsidx(rs, rsidx); - relay.is_hsdir_for_ring().then(|| ())?; + relay.is_hsdir_for_ring().then_some(())?; let relay = relay.into_relay()?; Some((rsidx, relay)) }) From d34d91a1dc78f2c8dfc93266a8efe834bb3ef47c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Apr 2023 15:33:49 -0400 Subject: [PATCH 3/5] Update MSRV in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1be8bf4e..cbee5f2f0 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ and obtain streams/sinks usable from async Rust. ## Minimum supported Rust Version -Our current Minimum Supported Rust Version (MSRV) is 1.60. +Our current Minimum Supported Rust Version (MSRV) is 1.65. When increasing this MSRV, we won't require any Rust version released in the last six months. (That is, we'll only require Rust versions released at least From d2e742f2ef524638dfab18cd2992008c51114d4b Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Apr 2023 15:34:36 -0400 Subject: [PATCH 4/5] Test with 1.65 in minimal_versions. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44467b132..298c2ab7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ coverage: minimal-versions: stage: test - image: rust:1.60 + image: rust:1.65 script: - rustup install nightly - ./maint/downgrade_dependencies From 6f9ceda6ca34d4e03d74abf2210214bf85c2d8c2 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Apr 2023 15:35:18 -0400 Subject: [PATCH 5/5] Add a global semver.md for MSRV break. --- semver.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 semver.md diff --git a/semver.md b/semver.md new file mode 100644 index 000000000..a37b56690 --- /dev/null +++ b/semver.md @@ -0,0 +1 @@ +BREAKING: Increased MSRV to 1.65