-
Notifications
You must be signed in to change notification settings - Fork 732
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net/rosenpass: Fix build with rust 1.78.0
PR: 278834 Approved by: portmgr (build fix blanket)
- Loading branch information
1 parent
7e86fe1
commit 75cbd67
Showing
1 changed file
with
32 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
Comment the "#[doc = !($field)]" line | ||
Upstream has changed this code a lot and this line is not present anymore. | ||
|
||
error: attribute value must be a literal | ||
--> rosenpass/src/msgs.rs:135:21 | ||
| | ||
135 | #[doc = !($field)] | ||
| ^^^^^^^^^ | ||
... | ||
258 | / data_lense! { Envelope<M> := | ||
259 | | /// [MsgType] of this message | ||
260 | | msg_type: 1, | ||
261 | | /// Reserved for future use | ||
... | | ||
269 | | cookie: sodium::MAC_SIZE | ||
270 | | } | ||
| |_- in this macro invocation | ||
| | ||
= note: this error originates in the macro `data_lense` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
||
|
||
--- rosenpass/src/msgs.rs.orig 2024-05-07 11:12:55 UTC | ||
+++ rosenpass/src/msgs.rs | ||
@@ -132,7 +132,7 @@ macro_rules! data_lense( | ||
impl<__ContainerType $(, $( $generic: LenseView ),+ )? > $type<__ContainerType $(, $( $generic ),+ )? >{ | ||
$( | ||
/// Size in bytes of the field ` | ||
- #[doc = !($field)] | ||
+ //#[doc = !($field)] | ||
/// ` | ||
pub const fn [< $field _len >]() -> usize{ | ||
$len |