summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-05 06:35:20 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-05 06:35:20 +0100
commit99e0a71504456976ba88040f5d1d3bbc347694ea (patch)
treea228c064fd3847831ff8072aa9375dc59db47f47
parent8af69be47e88896b3c5f70174db609eee0c67971 (diff)
downloadiced-99e0a71504456976ba88040f5d1d3bbc347694ea.tar.gz
iced-99e0a71504456976ba88040f5d1d3bbc347694ea.tar.bz2
iced-99e0a71504456976ba88040f5d1d3bbc347694ea.zip
Rename `iced_native` to `iced_runtime`
-rw-r--r--Cargo.toml2
-rw-r--r--examples/integration/src/controls.rs2
-rw-r--r--examples/integration/src/main.rs4
-rw-r--r--native/src/window.rs23
-rw-r--r--runtime/Cargo.toml (renamed from native/Cargo.toml)2
-rw-r--r--runtime/README.md (renamed from native/README.md)0
-rw-r--r--runtime/src/clipboard.rs (renamed from native/src/clipboard.rs)15
-rw-r--r--runtime/src/command.rs (renamed from native/src/command.rs)0
-rw-r--r--runtime/src/command/action.rs (renamed from native/src/command/action.rs)0
-rw-r--r--runtime/src/debug/basic.rs (renamed from native/src/debug/basic.rs)0
-rw-r--r--runtime/src/debug/null.rs (renamed from native/src/debug/null.rs)0
-rw-r--r--runtime/src/font.rs (renamed from native/src/font.rs)0
-rw-r--r--runtime/src/keyboard.rs (renamed from native/src/keyboard.rs)0
-rw-r--r--runtime/src/lib.rs (renamed from native/src/lib.rs)0
-rw-r--r--runtime/src/program.rs (renamed from native/src/program.rs)0
-rw-r--r--runtime/src/program/state.rs (renamed from native/src/program/state.rs)0
-rw-r--r--runtime/src/system.rs (renamed from native/src/system.rs)0
-rw-r--r--runtime/src/system/action.rs (renamed from native/src/system/action.rs)0
-rw-r--r--runtime/src/system/information.rs (renamed from native/src/system/information.rs)0
-rw-r--r--runtime/src/user_interface.rs (renamed from native/src/user_interface.rs)24
-rw-r--r--runtime/src/window.rs (renamed from winit/src/window.rs)28
-rw-r--r--runtime/src/window/action.rs (renamed from native/src/window/action.rs)0
-rw-r--r--src/advanced.rs2
-rw-r--r--src/application.rs2
-rw-r--r--src/lib.rs10
-rw-r--r--src/window.rs3
-rw-r--r--tiny_skia/Cargo.toml4
-rw-r--r--tiny_skia/src/text.rs2
-rw-r--r--widget/Cargo.toml4
-rw-r--r--widget/src/helpers.rs2
-rw-r--r--widget/src/lib.rs4
-rw-r--r--widget/src/scrollable.rs2
-rw-r--r--widget/src/text_input.rs2
-rw-r--r--winit/Cargo.toml6
-rw-r--r--winit/src/application.rs14
-rw-r--r--winit/src/application/state.rs2
-rw-r--r--winit/src/clipboard.rs14
-rw-r--r--winit/src/lib.rs7
-rw-r--r--winit/src/system.rs4
39 files changed, 87 insertions, 97 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 49a52311..a677569a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ members = [
"core",
"futures",
"graphics",
- "native",
+ "runtime",
"renderer",
"style",
"tiny_skia",
diff --git a/examples/integration/src/controls.rs b/examples/integration/src/controls.rs
index 16e21709..5849f730 100644
--- a/examples/integration/src/controls.rs
+++ b/examples/integration/src/controls.rs
@@ -1,7 +1,7 @@
use iced_wgpu::Renderer;
use iced_widget::{slider, text_input, Column, Row, Text};
use iced_winit::core::{Alignment, Color, Element, Length};
-use iced_winit::native::{Command, Program};
+use iced_winit::runtime::{Command, Program};
use iced_winit::style::Theme;
pub struct Controls {
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index c1f1f076..9707eda7 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -8,8 +8,8 @@ use iced_wgpu::graphics::Viewport;
use iced_wgpu::{wgpu, Backend, Renderer, Settings};
use iced_winit::core::renderer;
use iced_winit::core::{Color, Size};
-use iced_winit::native::program;
-use iced_winit::native::Debug;
+use iced_winit::runtime::program;
+use iced_winit::runtime::Debug;
use iced_winit::style::Theme;
use iced_winit::{conversion, futures, winit, Clipboard};
diff --git a/native/src/window.rs b/native/src/window.rs
deleted file mode 100644
index aa3f35c7..00000000
--- a/native/src/window.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Build window-based GUI applications.
-mod action;
-
-pub use action::Action;
-
-use crate::core::time::Instant;
-use crate::core::window::Event;
-use crate::futures::subscription::{self, Subscription};
-
-/// Subscribes to the frames of the window of the running application.
-///
-/// The resulting [`Subscription`] will produce items at a rate equal to the
-/// refresh rate of the window. Note that this rate may be variable, as it is
-/// normally managed by the graphics driver and/or the OS.
-///
-/// In any case, this [`Subscription`] is useful to smoothly draw application-driven
-/// animations without missing any frames.
-pub fn frames() -> Subscription<Instant> {
- subscription::raw_events(|event, _status| match event {
- iced_core::Event::Window(Event::RedrawRequested(at)) => Some(at),
- _ => None,
- })
-}
diff --git a/native/Cargo.toml b/runtime/Cargo.toml
index bc4e7ca1..2d3e8db3 100644
--- a/native/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "iced_native"
+name = "iced_runtime"
version = "0.9.1"
authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
edition = "2021"
diff --git a/native/README.md b/runtime/README.md
index 996daa76..996daa76 100644
--- a/native/README.md
+++ b/runtime/README.md
diff --git a/native/src/clipboard.rs b/runtime/src/clipboard.rs
index e727c4a7..bc450912 100644
--- a/native/src/clipboard.rs
+++ b/runtime/src/clipboard.rs
@@ -1,5 +1,6 @@
//! Access the clipboard.
-use iced_futures::MaybeSend;
+use crate::command::{self, Command};
+use crate::futures::MaybeSend;
use std::fmt;
@@ -38,3 +39,15 @@ impl<T> fmt::Debug for Action<T> {
}
}
}
+
+/// Read the current contents of the clipboard.
+pub fn read<Message>(
+ f: impl Fn(Option<String>) -> Message + 'static,
+) -> Command<Message> {
+ Command::single(command::Action::Clipboard(Action::Read(Box::new(f))))
+}
+
+/// Write the given contents to the clipboard.
+pub fn write<Message>(contents: String) -> Command<Message> {
+ Command::single(command::Action::Clipboard(Action::Write(contents)))
+}
diff --git a/native/src/command.rs b/runtime/src/command.rs
index cd4c51ff..cd4c51ff 100644
--- a/native/src/command.rs
+++ b/runtime/src/command.rs
diff --git a/native/src/command/action.rs b/runtime/src/command/action.rs
index 6c74f0ef..6c74f0ef 100644
--- a/native/src/command/action.rs
+++ b/runtime/src/command/action.rs
diff --git a/native/src/debug/basic.rs b/runtime/src/debug/basic.rs
index 32f725a1..32f725a1 100644
--- a/native/src/debug/basic.rs
+++ b/runtime/src/debug/basic.rs
diff --git a/native/src/debug/null.rs b/runtime/src/debug/null.rs
index 2db0eebb..2db0eebb 100644
--- a/native/src/debug/null.rs
+++ b/runtime/src/debug/null.rs
diff --git a/native/src/font.rs b/runtime/src/font.rs
index 15359694..15359694 100644
--- a/native/src/font.rs
+++ b/runtime/src/font.rs
diff --git a/native/src/keyboard.rs b/runtime/src/keyboard.rs
index 012538e3..012538e3 100644
--- a/native/src/keyboard.rs
+++ b/runtime/src/keyboard.rs
diff --git a/native/src/lib.rs b/runtime/src/lib.rs
index aa45e57a..aa45e57a 100644
--- a/native/src/lib.rs
+++ b/runtime/src/lib.rs
diff --git a/native/src/program.rs b/runtime/src/program.rs
index 44585cc5..44585cc5 100644
--- a/native/src/program.rs
+++ b/runtime/src/program.rs
diff --git a/native/src/program/state.rs b/runtime/src/program/state.rs
index 2fa9934d..2fa9934d 100644
--- a/native/src/program/state.rs
+++ b/runtime/src/program/state.rs
diff --git a/native/src/system.rs b/runtime/src/system.rs
index 61c8ff29..61c8ff29 100644
--- a/native/src/system.rs
+++ b/runtime/src/system.rs
diff --git a/native/src/system/action.rs b/runtime/src/system/action.rs
index dea9536f..dea9536f 100644
--- a/native/src/system/action.rs
+++ b/runtime/src/system/action.rs
diff --git a/native/src/system/information.rs b/runtime/src/system/information.rs
index 93e7a5a4..93e7a5a4 100644
--- a/native/src/system/information.rs
+++ b/runtime/src/system/information.rs
diff --git a/native/src/user_interface.rs b/runtime/src/user_interface.rs
index 315027fa..2c76fd8a 100644
--- a/native/src/user_interface.rs
+++ b/runtime/src/user_interface.rs
@@ -32,7 +32,7 @@ pub struct UserInterface<'a, Message, Renderer> {
impl<'a, Message, Renderer> UserInterface<'a, Message, Renderer>
where
- Renderer: iced_core::Renderer,
+ Renderer: crate::core::Renderer,
{
/// Builds a user interface for an [`Element`].
///
@@ -46,7 +46,7 @@ where
///
/// ```no_run
/// # mod iced_wgpu {
- /// # pub use iced_native::core::renderer::Null as Renderer;
+ /// # pub use iced_runtime::core::renderer::Null as Renderer;
/// # }
/// #
/// # pub struct Counter;
@@ -56,8 +56,8 @@ where
/// # pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
/// # pub fn update(&mut self, _: ()) {}
/// # }
- /// use iced_native::core::Size;
- /// use iced_native::user_interface::{self, UserInterface};
+ /// use iced_runtime::core::Size;
+ /// use iced_runtime::user_interface::{self, UserInterface};
/// use iced_wgpu::Renderer;
///
/// // Initialization
@@ -119,7 +119,7 @@ where
///
/// ```no_run
/// # mod iced_wgpu {
- /// # pub use iced_native::core::renderer::Null as Renderer;
+ /// # pub use iced_runtime::core::renderer::Null as Renderer;
/// # }
/// #
/// # pub struct Counter;
@@ -129,8 +129,8 @@ where
/// # pub fn view(&self) -> iced_core::Element<(), Renderer> { unimplemented!() }
/// # pub fn update(&mut self, _: ()) {}
/// # }
- /// use iced_native::core::{clipboard, Size, Point};
- /// use iced_native::user_interface::{self, UserInterface};
+ /// use iced_runtime::core::{clipboard, Size, Point};
+ /// use iced_runtime::user_interface::{self, UserInterface};
/// use iced_wgpu::Renderer;
///
/// let mut counter = Counter::new();
@@ -348,7 +348,7 @@ where
///
/// ```no_run
/// # mod iced_wgpu {
- /// # pub use iced_native::core::renderer::Null as Renderer;
+ /// # pub use iced_runtime::core::renderer::Null as Renderer;
/// # pub type Theme = ();
/// # }
/// #
@@ -359,10 +359,10 @@ where
/// # pub fn view(&self) -> Element<(), Renderer> { unimplemented!() }
/// # pub fn update(&mut self, _: ()) {}
/// # }
- /// use iced_native::core::clipboard;
- /// use iced_native::core::renderer;
- /// use iced_native::core::{Element, Size, Point};
- /// use iced_native::user_interface::{self, UserInterface};
+ /// use iced_runtime::core::clipboard;
+ /// use iced_runtime::core::renderer;
+ /// use iced_runtime::core::{Element, Size, Point};
+ /// use iced_runtime::user_interface::{self, UserInterface};
/// use iced_wgpu::{Renderer, Theme};
///
/// let mut counter = Counter::new();
diff --git a/winit/src/window.rs b/runtime/src/window.rs
index 6ac58e20..236064f7 100644
--- a/winit/src/window.rs
+++ b/runtime/src/window.rs
@@ -1,7 +1,27 @@
-//! Interact with the window of your application.
-use crate::core::window::{Mode, UserAttention};
-use crate::native::command::{self, Command};
-use crate::native::window::Action;
+//! Build window-based GUI applications.
+mod action;
+
+pub use action::Action;
+
+use crate::command::{self, Command};
+use crate::core::time::Instant;
+use crate::core::window::{Event, Mode, UserAttention};
+use crate::futures::subscription::{self, Subscription};
+
+/// Subscribes to the frames of the window of the running application.
+///
+/// The resulting [`Subscription`] will produce items at a rate equal to the
+/// refresh rate of the window. Note that this rate may be variable, as it is
+/// normally managed by the graphics driver and/or the OS.
+///
+/// In any case, this [`Subscription`] is useful to smoothly draw application-driven
+/// animations without missing any frames.
+pub fn frames() -> Subscription<Instant> {
+ subscription::raw_events(|event, _status| match event {
+ iced_core::Event::Window(Event::RedrawRequested(at)) => Some(at),
+ _ => None,
+ })
+}
/// Closes the current window and exits the application.
pub fn close<Message>() -> Command<Message> {
diff --git a/native/src/window/action.rs b/runtime/src/window/action.rs
index c1dbd84f..c1dbd84f 100644
--- a/native/src/window/action.rs
+++ b/runtime/src/window/action.rs
diff --git a/src/advanced.rs b/src/advanced.rs
index 9621c3bc..7afba85c 100644
--- a/src/advanced.rs
+++ b/src/advanced.rs
@@ -10,5 +10,5 @@ pub use crate::core::{Clipboard, Shell};
pub mod subscription {
//! Write your own subscriptions.
- pub use crate::native::futures::subscription::{EventStream, Recipe};
+ pub use crate::runtime::futures::subscription::{EventStream, Recipe};
}
diff --git a/src/application.rs b/src/application.rs
index f5cf3317..c9ddf840 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -215,7 +215,7 @@ pub trait Application: Sized {
struct Instance<A: Application>(A);
-impl<A> crate::native::Program for Instance<A>
+impl<A> crate::runtime::Program for Instance<A>
where
A: Application,
{
diff --git a/src/lib.rs b/src/lib.rs
index b9f87d5d..c59d5058 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -169,7 +169,7 @@ use iced_widget::renderer;
use iced_widget::style;
use iced_winit as shell;
use iced_winit::core;
-use iced_winit::native;
+use iced_winit::runtime;
pub use iced_futures::futures;
@@ -192,11 +192,11 @@ pub use crate::core::{
color, Alignment, Background, Color, ContentFit, Length, Padding, Point,
Rectangle, Size, Vector,
};
-pub use crate::native::Command;
+pub use crate::runtime::Command;
pub mod clipboard {
//! Access the clipboard.
- pub use crate::shell::clipboard::{read, write};
+ pub use crate::runtime::clipboard::{read, write};
}
pub mod executor {
@@ -219,7 +219,7 @@ pub mod executor {
pub mod font {
//! Load and use fonts.
pub use crate::core::font::*;
- pub use crate::native::font::*;
+ pub use crate::runtime::font::*;
}
pub mod keyboard {
@@ -242,7 +242,7 @@ pub mod subscription {
#[cfg(feature = "system")]
pub mod system {
//! Retrieve system information.
- pub use crate::native::system::Information;
+ pub use crate::runtime::system::Information;
pub use crate::shell::system::*;
}
diff --git a/src/window.rs b/src/window.rs
index 26239065..824915b2 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -9,5 +9,4 @@ pub use position::Position;
pub use settings::Settings;
pub use crate::core::window::*;
-pub use crate::native::window::*;
-pub use crate::shell::window::*;
+pub use crate::runtime::window::*;
diff --git a/tiny_skia/Cargo.toml b/tiny_skia/Cargo.toml
index c4c36aba..08e79bb8 100644
--- a/tiny_skia/Cargo.toml
+++ b/tiny_skia/Cargo.toml
@@ -17,10 +17,6 @@ rustc-hash = "1.1"
ouroboros = "0.15"
kurbo = "0.9"
-[dependencies.iced_native]
-version = "0.9"
-path = "../native"
-
[dependencies.iced_graphics]
version = "0.7"
path = "../graphics"
diff --git a/tiny_skia/src/text.rs b/tiny_skia/src/text.rs
index 7a5034c2..c4edadb3 100644
--- a/tiny_skia/src/text.rs
+++ b/tiny_skia/src/text.rs
@@ -187,7 +187,7 @@ impl Pipeline {
&self,
content: &str,
size: f32,
- font: iced_native::Font,
+ font: Font,
bounds: Size,
point: Point,
_nearest_only: bool,
diff --git a/widget/Cargo.toml b/widget/Cargo.toml
index fb617079..4c23f3e8 100644
--- a/widget/Cargo.toml
+++ b/widget/Cargo.toml
@@ -15,9 +15,9 @@ unicode-segmentation = "1.6"
num-traits = "0.2"
thiserror = "1"
-[dependencies.iced_native]
+[dependencies.iced_runtime]
version = "0.9"
-path = "../native"
+path = "../runtime"
[dependencies.iced_renderer]
version = "0.1"
diff --git a/widget/src/helpers.rs b/widget/src/helpers.rs
index 1a73c16f..a43e7248 100644
--- a/widget/src/helpers.rs
+++ b/widget/src/helpers.rs
@@ -5,12 +5,12 @@ use crate::container::{self, Container};
use crate::core;
use crate::core::widget::operation;
use crate::core::{Element, Length, Pixels};
-use crate::native::Command;
use crate::overlay;
use crate::pick_list::{self, PickList};
use crate::progress_bar::{self, ProgressBar};
use crate::radio::{self, Radio};
use crate::rule::{self, Rule};
+use crate::runtime::Command;
use crate::scrollable::{self, Scrollable};
use crate::slider::{self, Slider};
use crate::text::{self, Text};
diff --git a/widget/src/lib.rs b/widget/src/lib.rs
index 4c1e7c1c..a3e7c8bc 100644
--- a/widget/src/lib.rs
+++ b/widget/src/lib.rs
@@ -14,10 +14,10 @@
)]
#![forbid(unsafe_code, rust_2018_idioms)]
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
-pub use iced_native as native;
-pub use iced_native::core;
pub use iced_renderer as renderer;
pub use iced_renderer::graphics;
+pub use iced_runtime as runtime;
+pub use iced_runtime::core;
pub use iced_style as style;
mod column;
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
index 49c780de..5a7481f7 100644
--- a/widget/src/scrollable.rs
+++ b/widget/src/scrollable.rs
@@ -13,7 +13,7 @@ use crate::core::{
Background, Clipboard, Color, Element, Layout, Length, Pixels, Point,
Rectangle, Shell, Size, Vector, Widget,
};
-use crate::native::Command;
+use crate::runtime::Command;
pub use crate::style::scrollable::{Scrollbar, Scroller, StyleSheet};
pub use operation::scrollable::RelativeOffset;
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index d1c48fbd..d066109a 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -28,7 +28,7 @@ use crate::core::{
Clipboard, Color, Element, Layout, Length, Padding, Pixels, Point,
Rectangle, Shell, Size, Vector, Widget,
};
-use crate::native::Command;
+use crate::runtime::Command;
pub use iced_style::text_input::{Appearance, StyleSheet};
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 21c14f68..bfd22093 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["gui"]
[features]
trace = ["tracing", "tracing-core", "tracing-subscriber"]
chrome-trace = ["trace", "tracing-chrome"]
-debug = ["iced_native/debug"]
+debug = ["iced_runtime/debug"]
system = ["sysinfo"]
application = []
@@ -27,9 +27,9 @@ version = "0.27"
git = "https://github.com/iced-rs/winit.git"
rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
-[dependencies.iced_native]
+[dependencies.iced_runtime]
version = "0.9"
-path = "../native"
+path = "../runtime"
[dependencies.iced_graphics]
version = "0.7"
diff --git a/winit/src/application.rs b/winit/src/application.rs
index d863c846..9666fcae 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -16,10 +16,10 @@ use crate::core::{Event, Size};
use crate::futures::futures;
use crate::futures::{Executor, Runtime, Subscription};
use crate::graphics::compositor::{self, Compositor};
-use crate::native::clipboard;
-use crate::native::program::Program;
-use crate::native::user_interface::{self, UserInterface};
-use crate::native::{Command, Debug};
+use crate::runtime::clipboard;
+use crate::runtime::program::Program;
+use crate::runtime::user_interface::{self, UserInterface};
+use crate::runtime::{Command, Debug};
use crate::style::application::{Appearance, StyleSheet};
use crate::{Clipboard, Error, Proxy, Settings};
@@ -709,9 +709,9 @@ pub fn run_command<A, E>(
E: Executor,
<A::Renderer as core::Renderer>::Theme: StyleSheet,
{
- use iced_native::command;
- use iced_native::system;
- use iced_native::window;
+ use crate::runtime::command;
+ use crate::runtime::system;
+ use crate::runtime::window;
for action in command.actions() {
match action {
diff --git a/winit/src/application/state.rs b/winit/src/application/state.rs
index b727e03c..c37ccca6 100644
--- a/winit/src/application/state.rs
+++ b/winit/src/application/state.rs
@@ -3,7 +3,7 @@ use crate::conversion;
use crate::core;
use crate::core::{Color, Point, Size};
use crate::graphics::Viewport;
-use crate::native::Debug;
+use crate::runtime::Debug;
use crate::Application;
use std::marker::PhantomData;
diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs
index 22509130..7271441d 100644
--- a/winit/src/clipboard.rs
+++ b/winit/src/clipboard.rs
@@ -1,6 +1,4 @@
//! Access the clipboard.
-use crate::native::clipboard::Action;
-use crate::native::command::{self, Command};
/// A buffer for short-term storage and transfer within and between
/// applications.
@@ -64,15 +62,3 @@ impl crate::core::Clipboard for Clipboard {
self.write(contents)
}
}
-
-/// Read the current contents of the clipboard.
-pub fn read<Message>(
- f: impl Fn(Option<String>) -> Message + 'static,
-) -> Command<Message> {
- Command::single(command::Action::Clipboard(Action::Read(Box::new(f))))
-}
-
-/// Write the given contents to the clipboard.
-pub fn write<Message>(contents: String) -> Command<Message> {
- Command::single(command::Action::Clipboard(Action::Write(contents)))
-}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 0d8c04d3..5cde510a 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -31,9 +31,9 @@
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
#![cfg_attr(docsrs, feature(doc_cfg))]
pub use iced_graphics as graphics;
-pub use iced_native as native;
-pub use iced_native::core;
-pub use iced_native::futures;
+pub use iced_runtime as runtime;
+pub use iced_runtime::core;
+pub use iced_runtime::futures;
pub use iced_style as style;
pub use winit;
@@ -42,7 +42,6 @@ pub mod application;
pub mod clipboard;
pub mod conversion;
pub mod settings;
-pub mod window;
#[cfg(feature = "system")]
pub mod system;
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 3a6a8a8e..069efa29 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -1,7 +1,7 @@
//! Access the native system.
use crate::graphics::compositor;
-use crate::native::command::{self, Command};
-use crate::native::system::{Action, Information};
+use crate::runtime::command::{self, Command};
+use crate::runtime::system::{Action, Information};
/// Query for available system information.
pub fn fetch_information<Message>(