Skip to content

Commit 390afd0

Browse files
committed
rust: remove some ..Default::default()s
Summary: In #4399, we decided to recommend `..Default::default()` on struct initializers for protos whose source of truth is not in our repo. This patch removes trivial `..Default::default()`s from struct initializers for `tensorboard.data` protos, which *do* live in our repo. We still use it sometimes: e.g., some requests have a `run_tag_filter` field that we don’t always care to set. This patch will make it harder to add new fields to these protos, but makes the code a bit easier to read in the meantime. Test Plan: Compilation suffices; unit tests are a nice sanity check. wchargin-branch: rust-remove-default-frus wchargin-source: 8b007d8f650840dbf05c459a3414d9dd421170a8
1 parent c22d00c commit 390afd0

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

tensorboard/data/server/server.rs

+2-24
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ impl TensorBoardDataProvider for DataProviderHandler {
5454
let mut res: data::ListPluginsResponse = Default::default();
5555
res.plugins.push(data::Plugin {
5656
name: "scalars".to_string(),
57-
..Default::default()
5857
});
5958
Ok(Response::new(res))
6059
}
@@ -85,10 +84,8 @@ impl TensorBoardDataProvider for DataProviderHandler {
8584
.map(|(Run(name), start_time)| data::Run {
8685
name,
8786
start_time: start_time.into(),
88-
..Default::default()
8987
})
9088
.collect(),
91-
..Default::default()
9289
};
9390
Ok(Response::new(res))
9491
}
@@ -141,7 +138,6 @@ impl TensorBoardDataProvider for DataProviderHandler {
141138
summary_metadata: Some(*ts.metadata.clone()),
142139
..Default::default()
143140
}),
144-
..Default::default()
145141
});
146142
}
147143
if !run_res.tags.is_empty() {
@@ -203,9 +199,7 @@ impl TensorBoardDataProvider for DataProviderHandler {
203199
step: steps,
204200
wall_time: wall_times,
205201
value: values,
206-
..Default::default()
207202
}),
208-
..Default::default()
209203
});
210204
}
211205
if !run_res.tags.is_empty() {
@@ -406,7 +400,6 @@ mod tests {
406400
let handler = sample_handler();
407401
let req = Request::new(data::ListPluginsRequest {
408402
experiment_id: "123".to_string(),
409-
..Default::default()
410403
});
411404
let res = handler.list_plugins(req).await.unwrap().into_inner();
412405
assert_eq!(
@@ -420,7 +413,6 @@ mod tests {
420413
let handler = sample_handler();
421414
let req = Request::new(data::ListRunsRequest {
422415
experiment_id: "123".to_string(),
423-
..Default::default()
424416
});
425417
let res = handler.list_runs(req).await.unwrap().into_inner();
426418
assert_eq!(
@@ -429,12 +421,10 @@ mod tests {
429421
data::Run {
430422
name: "train".to_string(),
431423
start_time: 1234.0,
432-
..Default::default()
433424
},
434425
data::Run {
435426
name: "test".to_string(),
436427
start_time: 6234.0,
437-
..Default::default()
438428
},
439429
]
440430
);
@@ -472,7 +462,6 @@ mod tests {
472462
experiment_id: "123".to_string(),
473463
plugin_filter: Some(data::PluginFilter {
474464
plugin_name: "scalars".to_string(),
475-
..Default::default()
476465
}),
477466
..Default::default()
478467
});
@@ -517,20 +506,14 @@ mod tests {
517506
experiment_id: "123".to_string(),
518507
plugin_filter: Some(data::PluginFilter {
519508
plugin_name: "scalars".to_string(),
520-
..Default::default()
521509
}),
522510
run_tag_filter: Some(data::RunTagFilter {
523511
runs: Some(data::RunFilter {
524512
names: vec!["train".to_string(), "nonexistent".to_string()],
525-
..Default::default()
526513
}),
527514
tags: None,
528-
..Default::default()
529-
}),
530-
downsample: Some(data::Downsample {
531-
num_points: 1000,
532-
..Default::default()
533515
}),
516+
downsample: Some(data::Downsample { num_points: 1000 }),
534517
..Default::default()
535518
});
536519

@@ -554,7 +537,6 @@ mod tests {
554537
experiment_id: "123".to_string(),
555538
plugin_filter: Some(data::PluginFilter {
556539
plugin_name: "scalars".to_string(),
557-
..Default::default()
558540
}),
559541
downsample: None,
560542
..Default::default()
@@ -573,12 +555,8 @@ mod tests {
573555
experiment_id: "123".to_string(),
574556
plugin_filter: Some(data::PluginFilter {
575557
plugin_name: "scalars".to_string(),
576-
..Default::default()
577-
}),
578-
downsample: Some(data::Downsample {
579-
num_points: 0,
580-
..Default::default()
581558
}),
559+
downsample: Some(data::Downsample { num_points: 0 }),
582560
..Default::default()
583561
});
584562
let res = handler.read_scalars(req).await.unwrap().into_inner();

0 commit comments

Comments
 (0)