Skip to content

Commit 0fc9d75

Browse files
authored
Override enpoints from command line args instead of extending them (#512)
1 parent 0a491a7 commit 0fc9d75

19 files changed

+38
-152
lines changed

examples/examples/z_delete.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,10 @@ fn parse_args() -> (Config, String) {
6666
config.set_mode(Some(mode)).unwrap();
6767
}
6868
if let Some(values) = args.values_of("connect") {
69-
config
70-
.connect
71-
.endpoints
72-
.extend(values.map(|v| v.parse().unwrap()))
69+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
7370
}
7471
if let Some(values) = args.values_of("listen") {
75-
config
76-
.listen
77-
.endpoints
78-
.extend(values.map(|v| v.parse().unwrap()))
72+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
7973
}
8074
if args.is_present("no-multicast-scouting") {
8175
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_forward.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,10 @@ fn parse_args() -> (Config, String, String) {
7171
config.set_mode(Some(mode)).unwrap();
7272
}
7373
if let Some(values) = args.values_of("connect") {
74-
config
75-
.connect
76-
.endpoints
77-
.extend(values.map(|v| v.parse().unwrap()))
74+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
7875
}
7976
if let Some(values) = args.values_of("listen") {
80-
config
81-
.listen
82-
.endpoints
83-
.extend(values.map(|v| v.parse().unwrap()))
77+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
8478
}
8579
if args.is_present("no-multicast-scouting") {
8680
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_get.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,10 @@ fn parse_args() -> (Config, String, Option<String>, QueryTarget, Duration) {
9494
config.set_mode(Some(mode)).unwrap();
9595
}
9696
if let Some(values) = args.values_of("connect") {
97-
config
98-
.connect
99-
.endpoints
100-
.extend(values.map(|v| v.parse().unwrap()))
97+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
10198
}
10299
if let Some(values) = args.values_of("listen") {
103-
config
104-
.listen
105-
.endpoints
106-
.extend(values.map(|v| v.parse().unwrap()))
100+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
107101
}
108102
if args.is_present("no-multicast-scouting") {
109103
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_get_liveliness.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,10 @@ fn parse_args() -> (Config, String, Duration) {
8080
config.set_mode(Some(mode)).unwrap();
8181
}
8282
if let Some(values) = args.values_of("connect") {
83-
config
84-
.connect
85-
.endpoints
86-
.extend(values.map(|v| v.parse().unwrap()))
83+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
8784
}
8885
if let Some(values) = args.values_of("listen") {
89-
config
90-
.listen
91-
.endpoints
92-
.extend(values.map(|v| v.parse().unwrap()))
86+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
9387
}
9488
if args.is_present("no-multicast-scouting") {
9589
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_info.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,10 @@ fn parse_args() -> Config {
6666
config.set_mode(Some(mode)).unwrap();
6767
}
6868
if let Some(values) = args.values_of("connect") {
69-
config
70-
.connect
71-
.endpoints
72-
.extend(values.map(|v| v.parse().unwrap()))
69+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
7370
}
7471
if let Some(values) = args.values_of("listen") {
75-
config
76-
.listen
77-
.endpoints
78-
.extend(values.map(|v| v.parse().unwrap()))
72+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
7973
}
8074
if args.is_present("no-multicast-scouting") {
8175
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_liveliness.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,10 @@ fn parse_args() -> (Config, KeyExpr<'static>) {
9191
config.set_mode(Some(mode)).unwrap();
9292
}
9393
if let Some(values) = args.values_of("connect") {
94-
config
95-
.connect
96-
.endpoints
97-
.extend(values.map(|v| v.parse().unwrap()))
94+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
9895
}
9996
if let Some(values) = args.values_of("listen") {
100-
config
101-
.listen
102-
.endpoints
103-
.extend(values.map(|v| v.parse().unwrap()))
97+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
10498
}
10599
if args.is_present("no-multicast-scouting") {
106100
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_ping.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,10 @@ fn parse_args() -> (Config, Duration, usize, usize) {
115115
config.set_mode(Some(mode)).unwrap();
116116
}
117117
if let Some(values) = args.values_of("connect") {
118-
config
119-
.connect
120-
.endpoints
121-
.extend(values.map(|v| v.parse().unwrap()))
118+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
122119
}
123120
if let Some(values) = args.values_of("listen") {
124-
config
125-
.listen
126-
.endpoints
127-
.extend(values.map(|v| v.parse().unwrap()))
121+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
128122
}
129123
if args.is_present("no-multicast-scouting") {
130124
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_pong.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,10 @@ fn parse_args() -> Config {
7575
config.set_mode(Some(mode)).unwrap();
7676
}
7777
if let Some(values) = args.values_of("connect") {
78-
config
79-
.connect
80-
.endpoints
81-
.extend(values.map(|v| v.parse().unwrap()))
78+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
8279
}
8380
if let Some(values) = args.values_of("listen") {
84-
config
85-
.listen
86-
.endpoints
87-
.extend(values.map(|v| v.parse().unwrap()))
81+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
8882
}
8983
if args.is_present("no-multicast-scouting") {
9084
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_pub.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,10 @@ fn parse_args() -> (Config, String, String) {
7575
config.set_mode(Some(mode)).unwrap();
7676
}
7777
if let Some(values) = args.values_of("connect") {
78-
config
79-
.connect
80-
.endpoints
81-
.extend(values.map(|v| v.parse().unwrap()))
78+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
8279
}
8380
if let Some(values) = args.values_of("listen") {
84-
config
85-
.listen
86-
.endpoints
87-
.extend(values.map(|v| v.parse().unwrap()))
81+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
8882
}
8983
if args.is_present("no-multicast-scouting") {
9084
config.scouting.multicast.set_enabled(Some(false)).unwrap();

examples/examples/z_pub_shm.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,10 @@ fn parse_args() -> (Config, String, String) {
136136
config.set_mode(Some(mode)).unwrap();
137137
}
138138
if let Some(values) = args.values_of("connect") {
139-
config
140-
.connect
141-
.endpoints
142-
.extend(values.map(|v| v.parse().unwrap()))
139+
config.connect.endpoints = values.map(|v| v.parse().unwrap()).collect();
143140
}
144141
if let Some(values) = args.values_of("listen") {
145-
config
146-
.listen
147-
.endpoints
148-
.extend(values.map(|v| v.parse().unwrap()))
142+
config.listen.endpoints = values.map(|v| v.parse().unwrap()).collect();
149143
}
150144
if args.is_present("no-multicast-scouting") {
151145
config.scouting.multicast.set_enabled(Some(false)).unwrap();

0 commit comments

Comments
 (0)