summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
Diffstat (limited to 'winit')
-rw-r--r--winit/src/program.rs10
-rw-r--r--winit/src/system.rs2
2 files changed, 7 insertions, 5 deletions
diff --git a/winit/src/program.rs b/winit/src/program.rs
index d55aedf1..3a4e2e48 100644
--- a/winit/src/program.rs
+++ b/winit/src/program.rs
@@ -203,11 +203,13 @@ where
let (program, task) = runtime.enter(|| P::new(flags));
- if let Some(stream) = task.into_stream() {
+ if let Some(stream) = runtime::task::into_stream(task) {
runtime.run(stream);
}
- runtime.track(program.subscription().map(Action::Output).into_recipes());
+ runtime.track(subscription::into_recipes(
+ program.subscription().map(Action::Output),
+ ));
let (boot_sender, boot_receiver) = oneshot::channel();
let (event_sender, event_receiver) = mpsc::unbounded();
@@ -1114,13 +1116,13 @@ fn update<P: Program, E: Executor>(
let task = runtime.enter(|| program.update(message));
debug.update_finished();
- if let Some(stream) = task.into_stream() {
+ if let Some(stream) = runtime::task::into_stream(task) {
runtime.run(stream);
}
}
let subscription = program.subscription();
- runtime.track(subscription.map(Action::Output).into_recipes());
+ runtime.track(subscription::into_recipes(subscription.map(Action::Output)));
}
fn run_action<P, C>(
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 7997f311..361135be 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -5,7 +5,7 @@ use crate::runtime::{self, Task};
/// Query for available system information.
pub fn fetch_information() -> Task<Information> {
- Task::oneshot(|channel| {
+ runtime::task::oneshot(|channel| {
runtime::Action::System(Action::QueryInformation(channel))
})
}