Skip to content
Snippets Groups Projects
Commit 1f215da1 authored by Ian Jackson's avatar Ian Jackson
Browse files

Rename ThingListBuilder::replace (from set)

parent dca4f3ed
No related branches found
No related tags found
No related merge requests found
......@@ -398,8 +398,8 @@ mod test {
.clone();
let mut bld = TorClientConfig::builder();
bld.tor_network().authorities().set(vec![auth]);
bld.tor_network().fallback_caches().set(vec![fallback]);
bld.tor_network().authorities().replace(vec![auth]);
bld.tor_network().fallback_caches().replace(vec![fallback]);
bld.storage()
.cache_dir(CfgPath::new("/var/tmp/foo".to_owned()))
.state_dir(CfgPath::new("/var/tmp/bar".to_owned()));
......
......@@ -239,11 +239,11 @@ mod test {
let mut bld = ArtiConfig::builder();
bld.proxy().socks_port(Some(9999));
bld.logging().console("warn");
bld.tor().tor_network().authorities().set(vec![auth]);
bld.tor().tor_network().authorities().replace(vec![auth]);
bld.tor()
.tor_network()
.fallback_caches()
.set(vec![fallback]);
.replace(vec![fallback]);
bld.tor()
.storage()
.cache_dir(CfgPath::new("/var/tmp/foo".to_owned()))
......@@ -263,7 +263,7 @@ mod test {
bld.tor()
.preemptive_circuits()
.initial_predicted_ports()
.set(vec![80, 443]);
.replace(vec![80, 443]);
bld.tor()
.preemptive_circuits()
.prediction_lifetime(Duration::from_secs(3600))
......
......@@ -95,7 +95,7 @@ mod test {
#[test]
fn predicts_starting_ports() {
let mut cfg = PreemptiveCircuitConfig::builder();
cfg.initial_predicted_ports().set(vec![]);
cfg.initial_predicted_ports().replace(vec![]);
cfg.prediction_lifetime(Duration::from_secs(2));
let predictor = PreemptiveCircuitPredictor::new(cfg.build().unwrap());
......@@ -108,7 +108,7 @@ mod test {
);
let mut cfg = PreemptiveCircuitConfig::builder();
cfg.initial_predicted_ports().set(vec![80]);
cfg.initial_predicted_ports().replace(vec![80]);
cfg.prediction_lifetime(Duration::from_secs(2));
let predictor = PreemptiveCircuitPredictor::new(cfg.build().unwrap());
......@@ -131,7 +131,7 @@ mod test {
#[test]
fn predicts_used_ports() {
let mut cfg = PreemptiveCircuitConfig::builder();
cfg.initial_predicted_ports().set(vec![]);
cfg.initial_predicted_ports().replace(vec![]);
cfg.prediction_lifetime(Duration::from_secs(2));
let mut predictor = PreemptiveCircuitPredictor::new(cfg.build().unwrap());
......@@ -164,7 +164,7 @@ mod test {
#[test]
fn does_not_predict_old_ports() {
let mut cfg = PreemptiveCircuitConfig::builder();
cfg.initial_predicted_ports().set(vec![]);
cfg.initial_predicted_ports().replace(vec![]);
cfg.prediction_lifetime(Duration::from_secs(2));
let mut predictor = PreemptiveCircuitPredictor::new(cfg.build().unwrap());
let more_than_an_hour_ago = Instant::now() - Duration::from_secs(60 * 60 + 1);
......
......@@ -47,7 +47,7 @@
/// thinglist.append(ThingBuilder::default().value(42).clone());
/// assert_eq!{ thinglist.build().unwrap().things, &[Thing { value: 42 }] }
///
/// thinglist.set(vec![ThingBuilder::default().value(38).clone()]);
/// thinglist.replace(vec![ThingBuilder::default().value(38).clone()]);
/// assert_eq!{ thinglist.build().unwrap().things, &[Thing { value: 38 }] }
/// ```
#[macro_export]
......@@ -81,7 +81,7 @@ macro_rules! define_list_config_builder {
}
/// Set the list to the supplied one, discarding any previous settings
pub fn set(&mut self, list: impl IntoIterator<Item = $EntryBuilder>) -> &mut Self {
pub fn replace(&mut self, list: impl IntoIterator<Item = $EntryBuilder>) -> &mut Self {
self.$things = Some(list.into_iter().collect());
self
}
......
......@@ -353,7 +353,7 @@ mod test {
// with any authorities set, the fallback list _must_ be set
// or the build fails.
bld.authorities().set(vec![
bld.authorities().replace(vec![
Authority::builder()
.name("Hello")
.v3ident([b'?'; 20].into())
......@@ -365,7 +365,7 @@ mod test {
]);
assert!(bld.build().is_err());
bld.fallback_caches().set(vec![FallbackDir::builder()
bld.fallback_caches().replace(vec![FallbackDir::builder()
.rsa_identity([b'x'; 20].into())
.ed_identity([b'y'; 32].into())
.orport("127.0.0.1:99".parse().unwrap())
......
......@@ -1012,9 +1012,9 @@ mod test {
impl DirRcv {
fn new(now: SystemTime, authorities: Option<Vec<AuthorityBuilder>>) -> Self {
let mut netcfg = crate::NetworkConfig::builder();
netcfg.fallback_caches().set(vec![]);
netcfg.fallback_caches().replace(vec![]);
if let Some(a) = authorities {
netcfg.authorities().set(a);
netcfg.authorities().replace(a);
}
let cfg = DirMgrConfig {
cache_path: "/we_will_never_use_this/".into(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment