From 5de404ddd9484c6e1113697d749524ac79d8c763 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 16 Jan 2020 07:01:25 +0100 Subject: Take `IntoIterator` instead of `Iterator` --- core/src/command.rs | 7 +++++-- core/src/subscription.rs | 3 ++- native/src/user_interface.rs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/src/command.rs b/core/src/command.rs index 1172976f..e7885fb8 100644 --- a/core/src/command.rs +++ b/core/src/command.rs @@ -65,9 +65,12 @@ impl Command { /// Once this command is run, all the commands will be exectued at once. /// /// [`Command`]: struct.Command.html - pub fn batch(commands: impl Iterator>) -> Self { + pub fn batch(commands: impl IntoIterator>) -> Self { Self { - futures: commands.flat_map(|command| command.futures).collect(), + futures: commands + .into_iter() + .flat_map(|command| command.futures) + .collect(), } } diff --git a/core/src/subscription.rs b/core/src/subscription.rs index 8de6cae8..d9e7e388 100644 --- a/core/src/subscription.rs +++ b/core/src/subscription.rs @@ -50,10 +50,11 @@ where /// /// [`Subscription`]: struct.Subscription.html pub fn batch( - subscriptions: impl Iterator>, + subscriptions: impl IntoIterator>, ) -> Self { Self { recipes: subscriptions + .into_iter() .flat_map(|subscription| subscription.recipes) .collect(), } diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs index 85b25bc7..53b36240 100644 --- a/native/src/user_interface.rs +++ b/native/src/user_interface.rs @@ -176,7 +176,7 @@ where &mut self, renderer: &Renderer, clipboard: Option<&dyn Clipboard>, - events: impl Iterator, + events: impl IntoIterator, ) -> Vec { let mut messages = Vec::new(); -- cgit