Skip to content

Commit 6b95b01

Browse files
authored
Switch monolithic lib to module re-exports (#13059)
# Objective Makes crate module docs render correctly in the docs for the monolithic library. Fixes #13055. ## Solution Swap from ```rust pub mod foo { pub use bevy_foo::*; } ``` to ```rust pub use bevy_foo as foo; ```
1 parent 570c43f commit 6b95b01

File tree

1 file changed

+39
-188
lines changed
  • crates/bevy_internal/src

1 file changed

+39
-188
lines changed

crates/bevy_internal/src/lib.rs

Lines changed: 39 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -13,202 +13,53 @@ pub mod prelude;
1313
mod default_plugins;
1414
pub use default_plugins::*;
1515

16-
/// Integrate with platform accessibility APIs.
17-
pub mod a11y {
18-
pub use bevy_a11y::*;
19-
}
20-
21-
/// Build bevy apps, create plugins, and read events.
22-
pub mod app {
23-
pub use bevy_app::*;
24-
}
25-
26-
/// Load and store assets and resources for Apps.
27-
#[cfg(feature = "bevy_asset")]
28-
pub mod asset {
29-
pub use bevy_asset::*;
30-
}
31-
32-
/// Contains core plugins.
33-
pub mod core {
34-
pub use bevy_core::*;
35-
}
36-
37-
/// Shared color types and operations.
38-
#[cfg(feature = "bevy_color")]
39-
pub mod color {
40-
pub use bevy_color::*;
41-
}
42-
43-
/// Useful diagnostic plugins and types for bevy apps.
44-
pub mod diagnostic {
45-
pub use bevy_diagnostic::*;
46-
}
47-
48-
/// Bevy's entity-component-system.
49-
pub mod ecs {
50-
pub use bevy_ecs::*;
51-
}
52-
53-
/// Resources and events for inputs, e.g. mouse/keyboard, touch, gamepads, etc.
54-
pub mod input {
55-
pub use bevy_input::*;
56-
}
57-
58-
/// Logging capabilities
59-
pub mod log {
60-
pub use bevy_log::*;
61-
}
62-
63-
/// Math types (Vec3, Mat4, Quat, etc) and helpers.
64-
pub mod math {
65-
pub use bevy_math::*;
66-
}
67-
68-
/// Utilities for working with untyped pointers in a more safe way.
69-
pub mod ptr {
70-
pub use bevy_ptr::*;
71-
}
72-
73-
/// Type reflection used for dynamically interacting with rust types.
74-
pub mod reflect {
75-
pub use bevy_reflect::*;
76-
}
77-
78-
/// Save/load collections of entities and components to/from file.
79-
#[cfg(feature = "bevy_scene")]
80-
pub mod scene {
81-
pub use bevy_scene::*;
82-
}
83-
84-
/// Pools for async, IO, and compute tasks.
85-
pub mod tasks {
86-
pub use bevy_tasks::*;
87-
}
88-
89-
/// Contains time utilities.
90-
pub mod time {
91-
pub use bevy_time::*;
92-
}
93-
94-
/// Entity hierarchies and property inheritance
95-
pub mod hierarchy {
96-
pub use bevy_hierarchy::*;
97-
}
98-
99-
/// Local and global transforms (e.g. translation, scale, rotation).
100-
pub mod transform {
101-
pub use bevy_transform::*;
102-
}
103-
104-
/// Various miscellaneous utilities for easing development
105-
pub mod utils {
106-
pub use bevy_utils::*;
107-
}
108-
109-
/// Configuration, creation, and management of one or more windows.
110-
pub mod window {
111-
pub use bevy_window::*;
112-
}
113-
114-
/// Provides types and plugins for animations.
16+
pub use bevy_a11y as a11y;
11517
#[cfg(feature = "bevy_animation")]
116-
pub mod animation {
117-
pub use bevy_animation::*;
118-
}
119-
120-
/// Provides types and plugins for audio playback.
18+
pub use bevy_animation as animation;
19+
pub use bevy_app as app;
20+
#[cfg(feature = "bevy_asset")]
21+
pub use bevy_asset as asset;
12122
#[cfg(feature = "bevy_audio")]
122-
pub mod audio {
123-
pub use bevy_audio::*;
124-
}
125-
126-
/// Core render pipeline.
23+
pub use bevy_audio as audio;
24+
#[cfg(feature = "bevy_color")]
25+
pub use bevy_color as color;
26+
pub use bevy_core as core;
12727
#[cfg(feature = "bevy_core_pipeline")]
128-
pub mod core_pipeline {
129-
pub use bevy_core_pipeline::*;
130-
}
131-
132-
/// Bevy interface with `GilRs` - "Game Input Library for Rust" - to handle gamepad inputs.
28+
pub use bevy_core_pipeline as core_pipeline;
29+
#[cfg(feature = "bevy_dev_tools")]
30+
pub use bevy_dev_tools as dev_tools;
31+
pub use bevy_diagnostic as diagnostic;
32+
#[cfg(feature = "bevy_dynamic_plugin")]
33+
pub use bevy_dynamic_plugin as dynamic_plugin;
34+
pub use bevy_ecs as ecs;
13335
#[cfg(feature = "bevy_gilrs")]
134-
pub mod gilrs {
135-
pub use bevy_gilrs::*;
136-
}
137-
138-
/// Support for GLTF file loading.
36+
pub use bevy_gilrs as gilrs;
37+
#[cfg(feature = "bevy_gizmos")]
38+
pub use bevy_gizmos as gizmos;
13939
#[cfg(feature = "bevy_gltf")]
140-
pub mod gltf {
141-
pub use bevy_gltf::*;
142-
}
143-
144-
/// Physically based rendering.
40+
pub use bevy_gltf as gltf;
41+
pub use bevy_hierarchy as hierarchy;
42+
pub use bevy_input as input;
43+
pub use bevy_log as log;
44+
pub use bevy_math as math;
14545
#[cfg(feature = "bevy_pbr")]
146-
pub mod pbr {
147-
pub use bevy_pbr::*;
148-
}
149-
150-
/// Cameras, meshes, textures, shaders, and pipelines.
151-
/// Use [`RenderDevice::features`](renderer::RenderDevice::features),
152-
/// [`RenderDevice::limits`](renderer::RenderDevice::limits), and the
153-
/// [`RenderAdapterInfo`](renderer::RenderAdapterInfo) resource to
154-
/// get runtime information about the actual adapter, backend, features, and limits.
46+
pub use bevy_pbr as pbr;
47+
pub use bevy_ptr as ptr;
48+
pub use bevy_reflect as reflect;
15549
#[cfg(feature = "bevy_render")]
156-
pub mod render {
157-
pub use bevy_render::*;
158-
}
159-
160-
/// Items for sprites, rects, texture atlases, etc.
50+
pub use bevy_render as render;
51+
#[cfg(feature = "bevy_scene")]
52+
pub use bevy_scene as scene;
16153
#[cfg(feature = "bevy_sprite")]
162-
pub mod sprite {
163-
pub use bevy_sprite::*;
164-
}
165-
166-
/// Text drawing, styling, and font assets.
54+
pub use bevy_sprite as sprite;
55+
pub use bevy_tasks as tasks;
16756
#[cfg(feature = "bevy_text")]
168-
pub mod text {
169-
pub use bevy_text::*;
170-
}
171-
172-
/// User interface components and widgets.
57+
pub use bevy_text as text;
58+
pub use bevy_time as time;
59+
pub use bevy_transform as transform;
17360
#[cfg(feature = "bevy_ui")]
174-
pub mod ui {
175-
pub use bevy_ui::*;
176-
}
177-
178-
/// Window creation, configuration, and handling
61+
pub use bevy_ui as ui;
62+
pub use bevy_utils as utils;
63+
pub use bevy_window as window;
17964
#[cfg(feature = "bevy_winit")]
180-
pub mod winit {
181-
pub use bevy_winit::*;
182-
}
183-
184-
/// Immediate mode drawing api for visual debugging.
185-
///
186-
/// # Example
187-
/// ```
188-
/// # use bevy_gizmos::prelude::*;
189-
/// # use bevy_render::prelude::*;
190-
/// # use bevy_math::prelude::*;
191-
/// # use bevy_color::palettes::basic::GREEN;
192-
/// fn system(mut gizmos: Gizmos) {
193-
/// gizmos.line(Vec3::ZERO, Vec3::X, GREEN);
194-
/// }
195-
/// # bevy_ecs::system::assert_is_system(system);
196-
/// ```
197-
///
198-
/// See the documentation on [`Gizmos`](gizmos::Gizmos) for more examples.
199-
#[cfg(feature = "bevy_gizmos")]
200-
pub mod gizmos {
201-
pub use bevy_gizmos::*;
202-
}
203-
204-
/// Dynamic linking of plugins
205-
#[cfg(feature = "bevy_dynamic_plugin")]
206-
pub mod dynamic_plugin {
207-
pub use bevy_dynamic_plugin::*;
208-
}
209-
210-
/// Collection of developer tools
211-
#[cfg(feature = "bevy_dev_tools")]
212-
pub mod dev_tools {
213-
pub use bevy_dev_tools::*;
214-
}
65+
pub use bevy_winit as winit;

0 commit comments

Comments
 (0)