diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-02-10 14:17:10 -0500 |
| commit | d9144700af5602cc267c0d147145c100567fdbb3 (patch) | |
| tree | e2fa2b02f27043e78bef7e613a965dd23e70f8e7 | |
| parent | dab0b1c3a775ad2f0bd5df785cf6b0c56eb18361 (diff) | |
| parent | 0c90fc37ec7fcee01db6bc5e0784e759a7ec954c (diff) | |
| download | tor-d9144700af5602cc267c0d147145c100567fdbb3.tar.gz tor-d9144700af5602cc267c0d147145c100567fdbb3.zip | |
Merge branch 'maint-0.4.2'
| -rw-r--r-- | changes/ticket33212 | 4 | ||||
| -rw-r--r-- | src/rust/protover/protover.rs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket33212 b/changes/ticket33212 new file mode 100644 index 0000000000..aeb09e0c67 --- /dev/null +++ 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 index 7a76fcdd94..0ca960bd69 100644 --- 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; |