chore(deps): bump ouroboros from 0.8.3 to 0.10.1 (#2374)

* chore(deps): bump ouroboros from 0.8.3 to 0.10.1

Bumps [ouroboros](https://github.com/joshua-maros/ouroboros) from 0.8.3 to 0.10.1.
- [Release notes](https://github.com/joshua-maros/ouroboros/releases)
- [Commits](https://github.com/joshua-maros/ouroboros/commits)

---
updated-dependencies:
- dependency-name: ouroboros
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* refactor: manual derives for `Entry`

- works better w/ ouroboros
- `Debug` now does not show useless+verbose raw data
- `PartialEq` now only compares deserialized data (which is likely more
  correct)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marco Neumann <marco@crepererum.net>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
pull/24376/head
dependabot[bot] 2021-08-23 17:25:14 +00:00 committed by GitHub
parent 0946ffe916
commit 7a11b7cfd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 10 deletions

19
Cargo.lock generated
View File

@ -7,10 +7,6 @@ name = "Inflector"
version = "0.11.4" version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
dependencies = [
"lazy_static",
"regex",
]
[[package]] [[package]]
name = "RustyXML" name = "RustyXML"
@ -64,6 +60,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "aliasable"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
[[package]] [[package]]
name = "alloc-no-stdlib" name = "alloc-no-stdlib"
version = "2.0.3" version = "2.0.3"
@ -2677,19 +2679,20 @@ dependencies = [
[[package]] [[package]]
name = "ouroboros" name = "ouroboros"
version = "0.8.3" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f6d5c203fe8d786d9d7bec8203cbbff3eb2cf8410c0d70cfd05b3d5f5d545da" checksum = "84236d64f1718c387232287cf036eb6632a5ecff226f4ff9dccb8c2b79ba0bde"
dependencies = [ dependencies = [
"aliasable",
"ouroboros_macro", "ouroboros_macro",
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]] [[package]]
name = "ouroboros_macro" name = "ouroboros_macro"
version = "0.8.3" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "129943a960e6a08c7e70ca5a09f113c273fe7f10ae8420992c78293e3dffdf65" checksum = "f463857a6eb96c0136b1d56e56c718350cef30412ec065b48294799a088bca68"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"proc-macro-error", "proc-macro-error",

View File

@ -13,6 +13,6 @@ data_types = { path = "../data_types" }
flatbuffers = "2" flatbuffers = "2"
snafu = "0.6" snafu = "0.6"
influxdb_line_protocol = { path = "../influxdb_line_protocol" } influxdb_line_protocol = { path = "../influxdb_line_protocol" }
ouroboros = "0.8.3" ouroboros = "0.10.1"
internal_types = { path = "../internal_types" } internal_types = { path = "../internal_types" }
generated_types = { path = "../generated_types" } generated_types = { path = "../generated_types" }

View File

@ -734,7 +734,6 @@ pub struct ShardedEntry {
/// Wrapper type for the flatbuffer Entry struct. Has convenience methods for /// Wrapper type for the flatbuffer Entry struct. Has convenience methods for
/// iterating through the partitioned writes. /// iterating through the partitioned writes.
#[self_referencing] #[self_referencing]
#[derive(Debug, PartialEq)]
pub struct Entry { pub struct Entry {
data: Vec<u8>, data: Vec<u8>,
#[borrows(data)] #[borrows(data)]
@ -789,6 +788,21 @@ impl Clone for Entry {
} }
} }
impl PartialEq for Entry {
fn eq(&self, other: &Self) -> bool {
// just compare the de-serialized entry, not the framebuffer-encoded data because the latter one is not normalized
self.fb() == other.fb()
}
}
impl std::fmt::Debug for Entry {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Entry")
.field("fb", &self.fb())
.finish_non_exhaustive()
}
}
/// Wrapper struct for the flatbuffers PartitionWrite. Has convenience methods /// Wrapper struct for the flatbuffers PartitionWrite. Has convenience methods
/// for iterating through the table batches. /// for iterating through the table batches.
#[derive(Debug)] #[derive(Debug)]