Skip to content

Commit

Permalink
rm dyn mention
Browse files Browse the repository at this point in the history
Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
  • Loading branch information
yoshuawuyts committed Sep 1, 2019
1 parent a06a43e commit a0546ba
Showing 1 changed file with 11 additions and 19 deletions.
30 changes: 11 additions & 19 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ impl<'a> Record<'a> {
file: self.file,
line: self.line,
key_values: self.key_values.clone(),
}
},
}
}
}
Expand Down Expand Up @@ -1389,10 +1389,12 @@ pub fn __private_api_log(
args: fmt::Arguments,
level: Level,
&(target, module_path, file, line): &(&str, &'static str, &'static str, u32),
kvs: Option<&[(&str, &str)]>
kvs: Option<&[(&str, &str)]>,
) {
if kvs.is_some() {
panic!("key-value support is experimental and must be enabled using the `kv_unstable` feature")
panic!(
"key-value support is experimental and must be enabled using the `kv_unstable` feature"
)
}

logger().log(
Expand All @@ -1414,18 +1416,15 @@ pub fn __private_api_log(
args: fmt::Arguments<'_>,
level: Level,
&(target, module_path, file, line): &(&str, &'static str, &'static str, u32),
kvs: Option<&[(&str, &str)]>
kvs: Option<&[(&str, &str)]>,
) {
// Ideally there would be a `From` impl available for this.
struct KeyValues<'a> {
inner: &'a [(&'a str, &'a str)],
}

impl<'a> kv::Source for KeyValues<'a> {
fn visit<'kvs>(
&'kvs self,
visitor: &mut dyn kv::Visitor<'kvs>,
) -> Result<(), kv::Error> {
fn visit<'kvs>(&'kvs self, visitor: &mut kv::Visitor<'kvs>) -> Result<(), kv::Error> {
for pair in self.inner {
visitor.visit_pair(pair.0.into(), pair.1.into())?;
}
Expand Down Expand Up @@ -1696,24 +1695,17 @@ mod tests {
fn visit_pair(
&mut self,
_: kv::Key<'kvs>,
_: kv::Value<'kvs>
_: kv::Value<'kvs>,
) -> Result<(), kv::Error> {
self.seen_pairs += 1;
Ok(())
}
}

let kvs: &[(&str, i32)] = &[
("a", 1),
("b", 2)
];
let record_test = Record::builder()
.key_values(&kvs)
.build();
let kvs: &[(&str, i32)] = &[("a", 1), ("b", 2)];
let record_test = Record::builder().key_values(&kvs).build();

let mut visitor = TestVisitor {
seen_pairs: 0,
};
let mut visitor = TestVisitor { seen_pairs: 0 };

record_test.key_values().visit(&mut visitor).unwrap();

Expand Down

0 comments on commit a0546ba

Please sign in to comment.