commit 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c parent c5e610af05dc7112a9b3aa18feeb6ba63290ff5c Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 10 Feb 2020 14:17:10 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 Diffstat:
| A | changes/ticket33212 | | | 4 | ++++ |
| M | src/rust/protover/protover.rs | | | 2 | +- |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket33212 b/changes/ticket33212 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust, build): + - Fix a syntax warning given by newer versions of Rust, and creating + problems for our continuous integration. + Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs @@ -26,7 +26,7 @@ const FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS: &'static str = "0.2.9.3-alpha"; /// before concluding that someone is trying to DoS us /// /// C_RUST_COUPLED: protover.c `MAX_PROTOCOLS_TO_EXPAND` -const MAX_PROTOCOLS_TO_EXPAND: usize = (1 << 16); +const MAX_PROTOCOLS_TO_EXPAND: usize = 1 << 16; /// The maximum size an `UnknownProtocol`'s name may be. pub(crate) const MAX_PROTOCOL_NAME_LENGTH: usize = 100;