@@ -6,7 +6,6 @@ use slog::*;
6
6
7
7
mod common;
8
8
9
-
10
9
struct Peer {
11
10
host : String ,
12
11
port : u32 ,
@@ -22,34 +21,14 @@ impl Peer {
22
21
}
23
22
24
23
// `KV` can be implemented for a struct
25
- #[ cfg( not( feature = "opaque-keys" ) ) ]
26
24
impl KV for Peer {
27
- fn serialize (
28
- & self ,
29
- _record : & Record ,
30
- serializer : & mut Serializer ,
31
- ) -> Result {
32
-
33
- serializer. emit_u32 ( "peer-port" , self . port ) ?;
34
- serializer. emit_str ( "peer-host" , & self . host ) ?;
35
- Ok ( ( ) )
36
- }
37
- }
38
- #[ cfg( feature = "opaque-keys" ) ]
39
- impl KV for Peer {
40
- fn serialize (
41
- & self ,
42
- _record : & Record ,
43
- serializer : & mut Serializer ,
44
- ) -> Result {
45
-
25
+ fn serialize ( & self , _record : & Record , serializer : & mut Serializer ) -> Result {
46
26
serializer. emit_u32 ( Key :: from ( "peer-port" ) , self . port ) ?;
47
27
serializer. emit_str ( Key :: from ( "peer-host" ) , & self . host ) ?;
48
28
Ok ( ( ) )
49
29
}
50
30
}
51
31
52
-
53
32
struct Server {
54
33
_host : String ,
55
34
_port : u32 ,
@@ -59,11 +38,9 @@ struct Server {
59
38
log : Logger ,
60
39
}
61
40
62
-
63
41
impl Server {
64
42
fn new ( host : String , port : u32 , log : Logger ) -> Server {
65
- let log =
66
- log. new ( o ! ( "server-host" => host. clone( ) , "server-port" => port) ) ;
43
+ let log = log. new ( o ! ( "server-host" => host. clone( ) , "server-port" => port) ) ;
67
44
Server {
68
45
_host : host,
69
46
_port : port,
@@ -102,10 +79,7 @@ impl PeerCounter {
102
79
}
103
80
104
81
fn main ( ) {
105
- let log = Logger :: root (
106
- Fuse ( common:: PrintlnDrain ) ,
107
- o ! ( "build-id" => "7.3.3-abcdef" ) ,
108
- ) ;
82
+ let log = Logger :: root ( Fuse ( common:: PrintlnDrain ) , o ! ( "build-id" => "7.3.3-abcdef" ) ) ;
109
83
110
84
let server = Server :: new ( "localhost" . into ( ) , 12345 , log. clone ( ) ) ;
111
85
0 commit comments