Keep in sinc slint and slint-interpreter re-export

Author: ogoffart

api/rs/slint/lib.rs

@@ -211,17 +211,20 @@ compile_error!(
 
 pub use slint_macros::slint;
 
-pub use i_slint_core::api::*;
 #[doc(hidden)]
 #[deprecated(note = "Experimental type was made public by mistake")]
 pub use i_slint_core::component_factory::ComponentFactory;
 #[cfg(not(target_arch = "wasm32"))]
 pub use i_slint_core::graphics::{BorrowedOpenGLTextureBuilder, BorrowedOpenGLTextureOrigin};
+pub use i_slint_core::translations::{select_bundled_translation, SelectBundledTranslationError};
+
 // keep in sync with internal/interpreter/api.rs
+pub use i_slint_backend_selector::api::*;
 #[cfg(feature = "std")]
 pub use i_slint_common::sharedfontique::{
     register_font_from_memory, FontHandle, RegisterFontError,
 };
+pub use i_slint_core::api::*;
 pub use i_slint_core::graphics::{
     Brush, Color, Image, LoadImageError, Rgb8Pixel, Rgba8Pixel, RgbaColor, SharedPixelBuffer,
 };
@@ -231,7 +234,6 @@ pub use i_slint_core::model::{
 };
 pub use i_slint_core::sharedvector::SharedVector;
 pub use i_slint_core::timers::{Timer, TimerMode};
-pub use i_slint_core::translations::{select_bundled_translation, SelectBundledTranslationError};
 pub use i_slint_core::{
     format,
     string::{SharedString, ToSharedString},
@@ -434,8 +436,6 @@ pub mod platform {
 ))]
 pub mod android;
 
-pub use i_slint_backend_selector::api::*;
-
 /// Helper type that helps checking that the generated code is generated for the right version
 #[doc(hidden)]
 #[allow(non_camel_case_types)]

internal/interpreter/api.rs

@@ -1,15 +1,16 @@
 // Copyright © SixtyFPS GmbH <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
 
+use crate::dynamic_item_tree::{ErasedItemTreeBox, WindowOptions};
 use i_slint_compiler::langtype::Type as LangType;
 use i_slint_core::component_factory::ComponentFactory;
 #[cfg(feature = "internal")]
 use i_slint_core::component_factory::FactoryContext;
 use i_slint_core::graphics::euclid::approxeq::ApproxEq as _;
-use i_slint_core::model::{Model, ModelExt, ModelRc};
+use i_slint_core::items::*;
 #[cfg(feature = "internal")]
 use i_slint_core::window::WindowInner;
-use i_slint_core::{PathData, SharedVector};
+use i_slint_core::PathData;
 use smol_str::SmolStr;
 use std::collections::HashMap;
 use std::future::Future;
@@ -19,15 +20,26 @@ use std::rc::Rc;
 #[doc(inline)]
 pub use i_slint_compiler::diagnostics::{Diagnostic, DiagnosticLevel};
 
-pub use i_slint_core::api::*;
 // keep in sync with api/rs/slint/lib.rs
 pub use i_slint_backend_selector::api::*;
+#[cfg(feature = "std")]
+pub use i_slint_common::sharedfontique::{
+    register_font_from_memory, FontHandle, RegisterFontError,
+};
+pub use i_slint_core::api::*;
 pub use i_slint_core::graphics::{
     Brush, Color, Image, LoadImageError, Rgb8Pixel, Rgba8Pixel, RgbaColor, SharedPixelBuffer,
 };
-use i_slint_core::items::*;
-
-use crate::dynamic_item_tree::{ErasedItemTreeBox, WindowOptions};
+pub use i_slint_core::model::{
+    FilterModel, MapModel, Model, ModelExt, ModelNotify, ModelPeer, ModelRc, ModelTracker,
+    ReverseModel, SortModel, StandardListViewItem, TableColumn, VecModel,
+};
+pub use i_slint_core::sharedvector::SharedVector;
+pub use i_slint_core::timers::{Timer, TimerMode};
+pub use i_slint_core::{
+    format,
+    string::{SharedString, ToSharedString},
+};
 
 /// This enum represents the different public variants of the [`Value`] enum, without
 /// the contained values.