From cd3b87bcf75352e483d70ddd6a741cf1b35fb9f2 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 8 Sep 2020 18:31:26 +0000 Subject: [PATCH 1/2] chore: Update to use `im 15.0.0` (that fix was simple and not at all obvious) Closes #253 --- sentry-core/Cargo.toml | 2 +- sentry-core/src/scope/real.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sentry-core/Cargo.toml b/sentry-core/Cargo.toml index cc82f456e..33f92a064 100644 --- a/sentry-core/Cargo.toml +++ b/sentry-core/Cargo.toml @@ -26,7 +26,7 @@ test = ["client"] sentry-types = { version = "0.19.1", path = "../sentry-types" } serde = { version = "1.0.104", features = ["derive"] } lazy_static = "1.4.0" -im = { version = "14.2.0", optional = true } +im = { version = "15.0.0", optional = true } rand = { version = "0.7.3", optional = true } serde_json = "1.0.46" log_ = { package = "log", version = "0.4.8", optional = true, features = ["std"] } diff --git a/sentry-core/src/scope/real.rs b/sentry-core/src/scope/real.rs index 4833b61f9..58faa2268 100644 --- a/sentry-core/src/scope/real.rs +++ b/sentry-core/src/scope/real.rs @@ -234,10 +234,10 @@ impl Scope { } } - event.breadcrumbs.extend(self.breadcrumbs.iter().cloned()); - event.extra.extend(self.extra.iter().cloned()); - event.tags.extend(self.tags.iter().cloned()); - event.contexts.extend(self.contexts.iter().cloned()); + event.breadcrumbs.extend(self.breadcrumbs.clone().into_iter()); + event.extra.extend(self.extra.clone().into_iter()); + event.tags.extend(self.tags.clone().into_iter()); + event.contexts.extend(self.contexts.clone().into_iter()); if event.transaction.is_none() { if let Some(ref txn) = self.transaction { From 6def39b676351a04cc62ae618450199349d4b278 Mon Sep 17 00:00:00 2001 From: jrconlin Date: Tue, 8 Sep 2020 20:41:40 +0000 Subject: [PATCH 2/2] f fmt --- sentry-core/src/scope/real.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sentry-core/src/scope/real.rs b/sentry-core/src/scope/real.rs index 58faa2268..44afba525 100644 --- a/sentry-core/src/scope/real.rs +++ b/sentry-core/src/scope/real.rs @@ -234,7 +234,9 @@ impl Scope { } } - event.breadcrumbs.extend(self.breadcrumbs.clone().into_iter()); + event + .breadcrumbs + .extend(self.breadcrumbs.clone().into_iter()); event.extra.extend(self.extra.clone().into_iter()); event.tags.extend(self.tags.clone().into_iter()); event.contexts.extend(self.contexts.clone().into_iter());