Rename bevy_platform_support to bevy_platform (#18813)

The goal of `bevy_platform_support` is to provide a set of platform
agnostic APIs, alongside platform-specific functionality. This is a high
traffic crate (providing things like HashMap and Instant). Especially in
light of https://github.com/bevyengine/bevy/discussions/18799, it
deserves a friendlier / shorter name.

Given that it hasn't had a full release yet, getting this change in
before Bevy 0.16 makes sense.

- Rename `bevy_platform_support` to `bevy_platform`.

benches/Cargo.toml

@@ -24,7 +24,7 @@ bevy_reflect = { path = "../crates/bevy_reflect", features = ["functions"] }
 bevy_render = { path = "../crates/bevy_render" }
 bevy_tasks = { path = "../crates/bevy_tasks" }
 bevy_utils = { path = "../crates/bevy_utils" }
-bevy_platform_support = { path = "../crates/bevy_platform_support", default-features = false, features = [
+bevy_platform = { path = "../crates/bevy_platform", default-features = false, features = [
   "std",
 ] }
 

benches/benches/bevy_reflect/map.rs

@@ -1,7 +1,7 @@
 use core::{fmt::Write, hint::black_box, iter, time::Duration};
 
 use benches::bench;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_reflect::{DynamicMap, Map};
 use criterion::{
     criterion_group, measurement::Measurement, AxisScale, BatchSize, BenchmarkGroup, BenchmarkId,

crates/bevy_animation/Cargo.toml

@@ -25,7 +25,7 @@ bevy_time = { path = "../bevy_time", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-rc.4" }
 bevy_transform = { path = "../bevy_transform", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
   "serialize",
 ] }
@@ -53,7 +53,7 @@ bevy_log = { path = "../bevy_log", version = "0.16.0-rc.4", default-features = f
 bevy_app = { path = "../bevy_app", version = "0.16.0-rc.4", default-features = false, features = [
   "web",
 ] }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "web",
 ] }
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-rc.4", default-features = false, features = [

crates/bevy_animation/src/animation_curves.rs

@@ -101,7 +101,7 @@ use bevy_math::curve::{
     Curve, Interval,
 };
 use bevy_mesh::morph::MorphWeights;
-use bevy_platform_support::hash::Hashed;
+use bevy_platform::hash::Hashed;
 use bevy_reflect::{FromReflect, Reflect, Reflectable, TypeInfo, Typed};
 use downcast_rs::{impl_downcast, Downcast};
 

crates/bevy_animation/src/graph.rs

@@ -17,7 +17,7 @@ use bevy_ecs::{
     resource::Resource,
     system::{Res, ResMut},
 };
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_reflect::{prelude::ReflectDefault, Reflect, ReflectSerialize};
 use derive_more::derive::From;
 use petgraph::{

crates/bevy_animation/src/lib.rs

@@ -35,7 +35,7 @@ use bevy_app::{Animation, App, Plugin, PostUpdate};
 use bevy_asset::{Asset, AssetApp, AssetEvents, Assets};
 use bevy_ecs::{prelude::*, world::EntityMutExcept};
 use bevy_math::FloatOrd;
-use bevy_platform_support::{collections::HashMap, hash::NoOpHash};
+use bevy_platform::{collections::HashMap, hash::NoOpHash};
 use bevy_reflect::{prelude::ReflectDefault, Reflect, TypePath};
 use bevy_time::Time;
 use bevy_transform::TransformSystem;
@@ -758,10 +758,10 @@ impl AnimationCurveEvaluators {
                 .component_property_curve_evaluators
                 .get_or_insert_with(component_property, func),
             EvaluatorId::Type(type_id) => match self.type_id_curve_evaluators.entry(type_id) {
-                bevy_platform_support::collections::hash_map::Entry::Occupied(occupied_entry) => {
+                bevy_platform::collections::hash_map::Entry::Occupied(occupied_entry) => {
                     &mut **occupied_entry.into_mut()
                 }
-                bevy_platform_support::collections::hash_map::Entry::Vacant(vacant_entry) => {
+                bevy_platform::collections::hash_map::Entry::Vacant(vacant_entry) => {
                     &mut **vacant_entry.insert(func())
                 }
             },

crates/bevy_app/Cargo.toml

@@ -49,7 +49,7 @@ std = [
   "downcast-rs/std",
   "bevy_utils/std",
   "bevy_tasks/std",
-  "bevy_platform_support/std",
+  "bevy_platform/std",
 ]
 
 ## `critical-section` provides the building blocks for synchronization primitives
@@ -57,14 +57,14 @@ std = [
 critical-section = [
   "bevy_tasks/critical-section",
   "bevy_ecs/critical-section",
-  "bevy_platform_support/critical-section",
+  "bevy_platform/critical-section",
   "bevy_reflect?/critical-section",
 ]
 
 ## Enables use of browser APIs.
 ## Note this is currently only applicable on `wasm32` architectures.
 web = [
-  "bevy_platform_support/web",
+  "bevy_platform/web",
   "bevy_tasks/web",
   "bevy_reflect?/web",
   "dep:wasm-bindgen",
@@ -81,7 +81,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4", default-features
   "alloc",
 ] }
 bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-rc.4", default-features = false }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false }
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false }
 
 # other
 downcast-rs = { version = "2", default-features = false }

crates/bevy_app/src/app.rs

@@ -16,7 +16,7 @@ use bevy_ecs::{
     schedule::{InternedSystemSet, ScheduleBuildSettings, ScheduleLabel},
     system::{IntoObserverSystem, ScheduleSystem, SystemId, SystemInput},
 };
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::{fmt::Debug, num::NonZero, panic::AssertUnwindSafe};
 use log::debug;
 

crates/bevy_app/src/plugin_group.rs

@@ -4,7 +4,7 @@ use alloc::{
     string::{String, ToString},
     vec::Vec,
 };
-use bevy_platform_support::collections::hash_map::Entry;
+use bevy_platform::collections::hash_map::Entry;
 use bevy_utils::TypeIdMap;
 use core::any::TypeId;
 use log::{debug, warn};

crates/bevy_app/src/schedule_runner.rs

@@ -3,7 +3,7 @@ use crate::{
     plugin::Plugin,
     PluginsState,
 };
-use bevy_platform_support::time::Instant;
+use bevy_platform::time::Instant;
 use core::time::Duration;
 
 #[cfg(all(target_arch = "wasm32", feature = "web"))]
@@ -160,7 +160,7 @@ impl Plugin for ScheduleRunnerPlugin {
                             loop {
                                 match tick(&mut app, wait) {
                                     Ok(Some(delay)) => {
-                                        bevy_platform_support::thread::sleep(delay);
+                                        bevy_platform::thread::sleep(delay);
                                     }
                                     Ok(None) => continue,
                                     Err(exit) => return exit,

crates/bevy_app/src/sub_app.rs

@@ -6,7 +6,7 @@ use bevy_ecs::{
     schedule::{InternedScheduleLabel, InternedSystemSet, ScheduleBuildSettings, ScheduleLabel},
     system::{ScheduleSystem, SystemId, SystemInput},
 };
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use core::fmt::Debug;
 
 #[cfg(feature = "trace")]

crates/bevy_app/src/task_pool_plugin.rs

@@ -1,7 +1,7 @@
 use crate::{App, Plugin};
 
 use alloc::string::ToString;
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 use bevy_tasks::{AsyncComputeTaskPool, ComputeTaskPool, IoTaskPool, TaskPoolBuilder};
 use core::{fmt::Debug, marker::PhantomData};
 use log::trace;

crates/bevy_asset/Cargo.toml

@@ -27,7 +27,7 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-rc.4", features = [
 ] }
 bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
 ] }
 

crates/bevy_asset/src/asset_changed.rs

@@ -13,7 +13,7 @@ use bevy_ecs::{
     storage::{Table, TableRow},
     world::unsafe_world_cell::UnsafeWorldCell,
 };
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::marker::PhantomData;
 use disqualified::ShortName;
 use tracing::error;

crates/bevy_asset/src/assets.rs

@@ -6,7 +6,7 @@ use bevy_ecs::{
     resource::Resource,
     system::{Res, ResMut, SystemChangeTick},
 };
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_reflect::{Reflect, TypePath};
 use core::{any::TypeId, iter::Enumerate, marker::PhantomData, sync::atomic::AtomicU32};
 use crossbeam_channel::{Receiver, Sender};
@@ -600,7 +600,7 @@ impl<A: Asset> Assets<A> {
 pub struct AssetsMutIterator<'a, A: Asset> {
     queued_events: &'a mut Vec<AssetEvent<A>>,
     dense_storage: Enumerate<core::slice::IterMut<'a, Entry<A>>>,
-    hash_map: bevy_platform_support::collections::hash_map::IterMut<'a, Uuid, A>,
+    hash_map: bevy_platform::collections::hash_map::IterMut<'a, Uuid, A>,
 }
 
 impl<'a, A: Asset> Iterator for AssetsMutIterator<'a, A> {

crates/bevy_asset/src/handle.rs

@@ -551,7 +551,7 @@ pub enum UntypedAssetConversionError {
 #[cfg(test)]
 mod tests {
     use alloc::boxed::Box;
-    use bevy_platform_support::hash::FixedHasher;
+    use bevy_platform::hash::FixedHasher;
     use bevy_reflect::PartialReflect;
     use core::hash::BuildHasher;
 

crates/bevy_asset/src/id.rs

@@ -441,7 +441,7 @@ mod tests {
     fn hash<T: Hash>(data: &T) -> u64 {
         use core::hash::BuildHasher;
 
-        bevy_platform_support::hash::FixedHasher.hash_one(data)
+        bevy_platform::hash::FixedHasher.hash_one(data)
     }
 
     /// Typed and Untyped `AssetIds` should be equivalent to each other and themselves

crates/bevy_asset/src/io/embedded/embedded_watcher.rs

@@ -4,7 +4,7 @@ use crate::io::{
     AssetSourceEvent, AssetWatcher,
 };
 use alloc::{boxed::Box, sync::Arc, vec::Vec};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::time::Duration;
 use notify_debouncer_full::{notify::RecommendedWatcher, Debouncer, RecommendedCache};
 use parking_lot::RwLock;

crates/bevy_asset/src/io/embedded/mod.rs

@@ -29,7 +29,7 @@ pub struct EmbeddedAssetRegistry {
     dir: Dir,
     #[cfg(feature = "embedded_watcher")]
     root_paths: alloc::sync::Arc<
-        parking_lot::RwLock<bevy_platform_support::collections::HashMap<Box<Path>, PathBuf>>,
+        parking_lot::RwLock<bevy_platform::collections::HashMap<Box<Path>, PathBuf>>,
     >,
 }
 

crates/bevy_asset/src/io/gated.rs

@@ -1,6 +1,6 @@
 use crate::io::{AssetReader, AssetReaderError, PathStream, Reader};
 use alloc::{boxed::Box, sync::Arc};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use crossbeam_channel::{Receiver, Sender};
 use parking_lot::RwLock;
 use std::path::Path;

crates/bevy_asset/src/io/memory.rs

@@ -1,6 +1,6 @@
 use crate::io::{AssetReader, AssetReaderError, PathStream, Reader};
 use alloc::{borrow::ToOwned, boxed::Box, sync::Arc, vec::Vec};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::{pin::Pin, task::Poll};
 use futures_io::AsyncRead;
 use futures_lite::{ready, Stream};

crates/bevy_asset/src/io/source.rs

@@ -9,7 +9,7 @@ use alloc::{
 };
 use atomicow::CowArc;
 use bevy_ecs::resource::Resource;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::{fmt::Display, hash::Hash, time::Duration};
 use thiserror::Error;
 use tracing::{error, warn};

crates/bevy_asset/src/lib.rs

@@ -223,7 +223,7 @@ use bevy_ecs::{
     schedule::{IntoScheduleConfigs, SystemSet},
     world::FromWorld,
 };
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use bevy_reflect::{FromReflect, GetTypeRegistration, Reflect, TypePath};
 use core::any::TypeId;
 use tracing::error;
@@ -686,7 +686,7 @@ mod tests {
         prelude::*,
         schedule::{LogLevel, ScheduleBuildSettings},
     };
-    use bevy_platform_support::collections::HashMap;
+    use bevy_platform::collections::HashMap;
     use bevy_reflect::TypePath;
     use core::time::Duration;
     use serde::{Deserialize, Serialize};

crates/bevy_asset/src/loader.rs

@@ -13,7 +13,7 @@ use alloc::{
 };
 use atomicow::CowArc;
 use bevy_ecs::world::World;
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_tasks::{BoxedFuture, ConditionalSendFuture};
 use core::any::{Any, TypeId};
 use downcast_rs::{impl_downcast, Downcast};

crates/bevy_asset/src/processor/log.rs

@@ -5,7 +5,7 @@ use alloc::{
     vec::Vec,
 };
 use async_fs::File;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use futures_lite::{AsyncReadExt, AsyncWriteExt};
 use std::path::PathBuf;
 use thiserror::Error;

crates/bevy_asset/src/processor/mod.rs

@@ -58,7 +58,7 @@ use crate::{
 };
 use alloc::{borrow::ToOwned, boxed::Box, collections::VecDeque, sync::Arc, vec, vec::Vec};
 use bevy_ecs::prelude::*;
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_tasks::IoTaskPool;
 use futures_io::ErrorKind;
 use futures_lite::{AsyncReadExt, AsyncWriteExt, StreamExt};

crates/bevy_asset/src/saver.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use alloc::boxed::Box;
 use atomicow::CowArc;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_tasks::{BoxedFuture, ConditionalSendFuture};
 use core::{borrow::Borrow, hash::Hash, ops::Deref};
 use serde::{Deserialize, Serialize};

crates/bevy_asset/src/server/info.rs

@@ -11,7 +11,7 @@ use alloc::{
     vec::Vec,
 };
 use bevy_ecs::world::World;
-use bevy_platform_support::collections::{hash_map::Entry, HashMap, HashSet};
+use bevy_platform::collections::{hash_map::Entry, HashMap, HashSet};
 use bevy_tasks::Task;
 use bevy_utils::TypeIdMap;
 use core::{any::TypeId, task::Waker};

crates/bevy_asset/src/server/loaders.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use alloc::{boxed::Box, sync::Arc, vec::Vec};
 use async_broadcast::RecvError;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_tasks::IoTaskPool;
 use bevy_utils::TypeIdMap;
 use core::any::TypeId;

crates/bevy_asset/src/server/mod.rs

@@ -26,7 +26,7 @@ use alloc::{
 };
 use atomicow::CowArc;
 use bevy_ecs::prelude::*;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use bevy_tasks::IoTaskPool;
 use core::{any::TypeId, future::Future, panic::AssertUnwindSafe, task::Poll};
 use crossbeam_channel::{Receiver, Sender};

crates/bevy_asset/src/transformer.rs

@@ -1,7 +1,7 @@
 use crate::{meta::Settings, Asset, ErasedLoadedAsset, Handle, LabeledAsset, UntypedHandle};
 use alloc::boxed::Box;
 use atomicow::CowArc;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_tasks::ConditionalSendFuture;
 use core::{
     borrow::Borrow,

crates/bevy_core_pipeline/Cargo.toml

@@ -35,7 +35,7 @@ bevy_transform = { path = "../bevy_transform", version = "0.16.0-rc.4" }
 bevy_math = { path = "../bevy_math", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
 bevy_window = { path = "../bevy_window", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
   "serialize",
 ] }

crates/bevy_core_pipeline/src/auto_exposure/buffers.rs

@@ -1,5 +1,5 @@
 use bevy_ecs::prelude::*;
-use bevy_platform_support::collections::{hash_map::Entry, HashMap};
+use bevy_platform::collections::{hash_map::Entry, HashMap};
 use bevy_render::{
     render_resource::{StorageBuffer, UniformBuffer},
     renderer::{RenderDevice, RenderQueue},

crates/bevy_core_pipeline/src/core_2d/mod.rs

@@ -34,7 +34,7 @@ pub mod graph {
 use core::ops::Range;
 
 use bevy_asset::UntypedAssetId;
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_render::{
     batching::gpu_preprocessing::GpuPreprocessingMode,
     render_phase::PhaseItemBatchSetKey,

crates/bevy_core_pipeline/src/core_3d/mod.rs

@@ -87,7 +87,7 @@ use bevy_color::LinearRgba;
 use bevy_ecs::prelude::*;
 use bevy_image::BevyDefault;
 use bevy_math::FloatOrd;
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_render::{
     camera::{Camera, ExtractedCamera},
     extract_component::ExtractComponentPlugin,

crates/bevy_core_pipeline/src/oit/mod.rs

@@ -4,8 +4,8 @@ use bevy_app::prelude::*;
 use bevy_asset::{load_internal_asset, weak_handle, Handle};
 use bevy_ecs::{component::*, prelude::*};
 use bevy_math::UVec2;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
-use bevy_platform_support::time::Instant;
+use bevy_platform::time::Instant;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
     camera::{Camera, ExtractedCamera},

crates/bevy_core_pipeline/src/upscaling/mod.rs

@@ -1,7 +1,7 @@
 use crate::blit::{BlitPipeline, BlitPipelineKey};
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use bevy_render::{
     camera::{CameraOutputMode, ExtractedCamera},
     render_resource::*,

crates/bevy_diagnostic/Cargo.toml

@@ -19,7 +19,7 @@ serialize = [
   "bevy_ecs/serialize",
   "bevy_time/serialize",
   "bevy_utils/serde",
-  "bevy_platform_support/serialize",
+  "bevy_platform/serialize",
 ]
 
 ## Disables diagnostics that are unsupported when Bevy is dynamically linked
@@ -37,7 +37,7 @@ std = [
   "serde?/std",
   "bevy_ecs/std",
   "bevy_app/std",
-  "bevy_platform_support/std",
+  "bevy_platform/std",
   "bevy_time/std",
   "bevy_utils/std",
   "bevy_tasks/std",
@@ -48,7 +48,7 @@ std = [
 critical-section = [
   "bevy_ecs/critical-section",
   "bevy_app/critical-section",
-  "bevy_platform_support/critical-section",
+  "bevy_platform/critical-section",
   "bevy_time/critical-section",
   "bevy_utils/critical-section",
   "bevy_tasks/critical-section",
@@ -63,7 +63,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4", default-features
   "alloc",
 ] }
 bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-rc.4", default-features = false }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "alloc",
 ] }
 

crates/bevy_diagnostic/src/diagnostic.rs

@@ -7,7 +7,7 @@ use core::{
 use bevy_app::{App, SubApp};
 use bevy_ecs::resource::Resource;
 use bevy_ecs::system::{Deferred, Res, SystemBuffer, SystemParam};
-use bevy_platform_support::{collections::HashMap, hash::PassHash, time::Instant};
+use bevy_platform::{collections::HashMap, hash::PassHash, time::Instant};
 use const_fnv1a_hash::fnv1a_hash_str_64;
 
 use crate::DEFAULT_MAX_HISTORY_LENGTH;

crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs

@@ -74,7 +74,7 @@ pub mod internal {
     use bevy_app::{App, First, Startup, Update};
     use bevy_ecs::resource::Resource;
     use bevy_ecs::{prelude::ResMut, system::Local};
-    use bevy_platform_support::time::Instant;
+    use bevy_platform::time::Instant;
     use bevy_tasks::{available_parallelism, block_on, poll_once, AsyncComputeTaskPool, Task};
     use log::info;
     use std::sync::Mutex;

crates/bevy_ecs/Cargo.toml

@@ -23,7 +23,7 @@ multi_threaded = ["bevy_tasks/multi_threaded", "dep:arrayvec"]
 serialize = [
   "dep:serde",
   "bevy_utils/serde",
-  "bevy_platform_support/serialize",
+  "bevy_platform/serialize",
   "indexmap/serde",
 ]
 
@@ -84,14 +84,14 @@ std = [
   "nonmax/std",
   "arrayvec?/std",
   "log/std",
-  "bevy_platform_support/std",
+  "bevy_platform/std",
 ]
 
 ## `critical-section` provides the building blocks for synchronization primitives
 ## on all platforms, including `no_std`.
 critical-section = [
   "bevy_tasks/critical-section",
-  "bevy_platform_support/critical-section",
+  "bevy_platform/critical-section",
   "bevy_reflect?/critical-section",
 ]
 
@@ -105,7 +105,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4", default-features
   "alloc",
 ] }
 bevy_ecs_macros = { path = "macros", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "alloc",
 ] }
 

crates/bevy_ecs/src/archetype.rs

@@ -27,7 +27,7 @@ use crate::{
     storage::{ImmutableSparseSet, SparseArray, SparseSet, SparseSetIndex, TableId, TableRow},
 };
 use alloc::{boxed::Box, vec::Vec};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::{
     hash::Hash,
     ops::{Index, IndexMut, RangeFrom},

crates/bevy_ecs/src/bundle.rs

@@ -23,7 +23,7 @@ use crate::{
     world::{unsafe_world_cell::UnsafeWorldCell, EntityWorldMut, ON_ADD, ON_INSERT, ON_REPLACE},
 };
 use alloc::{boxed::Box, vec, vec::Vec};
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_ptr::{ConstNonNull, OwningPtr};
 use bevy_utils::TypeIdMap;
 use core::{any::TypeId, ptr::NonNull};

crates/bevy_ecs/src/component.rs

@@ -15,8 +15,8 @@ use crate::{
 use alloc::boxed::Box;
 use alloc::{borrow::Cow, format, vec::Vec};
 pub use bevy_ecs_macros::Component;
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
-use bevy_platform_support::{
+use bevy_platform::{
     collections::{HashMap, HashSet},
     sync::PoisonError,
 };
@@ -675,7 +675,7 @@ pub struct HookContext {
 ///
 /// ```
 /// use bevy_ecs::prelude::*;
-/// use bevy_platform_support::collections::HashSet;
+/// use bevy_platform::collections::HashSet;
 ///
 /// #[derive(Component)]
 /// struct MyTrackedComponent;
@@ -1305,7 +1305,7 @@ impl Debug for QueuedComponents {
 /// Generates [`ComponentId`]s.
 #[derive(Debug, Default)]
 pub struct ComponentIds {
-    next: bevy_platform_support::sync::atomic::AtomicUsize,
+    next: bevy_platform::sync::atomic::AtomicUsize,
 }
 
 impl ComponentIds {
@@ -1313,7 +1313,7 @@ impl ComponentIds {
     pub fn peek(&self) -> ComponentId {
         ComponentId(
             self.next
-                .load(bevy_platform_support::sync::atomic::Ordering::Relaxed),
+                .load(bevy_platform::sync::atomic::Ordering::Relaxed),
         )
     }
 
@@ -1321,7 +1321,7 @@ impl ComponentIds {
     pub fn next(&self) -> ComponentId {
         ComponentId(
             self.next
-                .fetch_add(1, bevy_platform_support::sync::atomic::Ordering::Relaxed),
+                .fetch_add(1, bevy_platform::sync::atomic::Ordering::Relaxed),
         )
     }
 
@@ -1959,7 +1959,7 @@ pub struct Components {
     indices: TypeIdMap<ComponentId>,
     resource_indices: TypeIdMap<ComponentId>,
     // This is kept internal and local to verify that no deadlocks can occor.
-    queued: bevy_platform_support::sync::RwLock<QueuedComponents>,
+    queued: bevy_platform::sync::RwLock<QueuedComponents>,
 }
 
 impl Components {
@@ -2840,7 +2840,7 @@ impl RequiredComponents {
     ) {
         let entry = self.0.entry(component_id);
         match entry {
-            bevy_platform_support::collections::hash_map::Entry::Occupied(mut occupied) => {
+            bevy_platform::collections::hash_map::Entry::Occupied(mut occupied) => {
                 let current = occupied.get_mut();
                 if current.inheritance_depth > inheritance_depth {
                     *current = RequiredComponent {
@@ -2849,7 +2849,7 @@ impl RequiredComponents {
                     }
                 }
             }
-            bevy_platform_support::collections::hash_map::Entry::Vacant(vacant) => {
+            bevy_platform::collections::hash_map::Entry::Vacant(vacant) => {
                 vacant.insert(RequiredComponent {
                     constructor: constructor(),
                     inheritance_depth,

crates/bevy_ecs/src/entity/clone_entities.rs

@@ -1,5 +1,5 @@
 use alloc::{borrow::ToOwned, boxed::Box, collections::VecDeque, vec::Vec};
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_ptr::{Ptr, PtrMut};
 use bumpalo::Bump;
 use core::any::TypeId;

crates/bevy_ecs/src/entity/entity_set.rs

@@ -3,7 +3,7 @@ use alloc::{
     collections::{btree_map, btree_set},
     rc::Rc,
 };
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 
 use core::{
     array,
@@ -15,7 +15,7 @@ use core::{
 
 use super::{Entity, UniqueEntityEquivalentSlice};
 
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 
 /// A trait for types that contain an [`Entity`].
 ///

crates/bevy_ecs/src/entity/hash.rs

@@ -25,7 +25,7 @@ impl BuildHasher for EntityHash {
 ///
 /// If you have an unusual case -- say all your indices are multiples of 256
 /// or most of the entities are dead generations -- then you might want also to
-/// try [`DefaultHasher`](bevy_platform_support::hash::DefaultHasher) for a slower hash
+/// try [`DefaultHasher`](bevy_platform::hash::DefaultHasher) for a slower hash
 /// computation but fewer lookup conflicts.
 #[derive(Debug, Default)]
 pub struct EntityHasher {

crates/bevy_ecs/src/entity/hash_map.rs

@@ -9,7 +9,7 @@ use core::{
     ops::{Deref, DerefMut, Index},
 };
 
-use bevy_platform_support::collections::hash_map::{self, HashMap};
+use bevy_platform::collections::hash_map::{self, HashMap};
 #[cfg(feature = "bevy_reflect")]
 use bevy_reflect::Reflect;
 

crates/bevy_ecs/src/entity/hash_set.rs

@@ -12,7 +12,7 @@ use core::{
     },
 };
 
-use bevy_platform_support::collections::hash_set::{self, HashSet};
+use bevy_platform::collections::hash_set::{self, HashSet};
 #[cfg(feature = "bevy_reflect")]
 use bevy_reflect::Reflect;
 

crates/bevy_ecs/src/entity/index_map.rs

@@ -21,7 +21,7 @@ use indexmap::map::{self, IndexMap, IntoValues, ValuesMut};
 
 use super::{Entity, EntityEquivalent, EntityHash, EntitySetIterator};
 
-use bevy_platform_support::prelude::Box;
+use bevy_platform::prelude::Box;
 
 /// A [`IndexMap`] pre-configured to use [`EntityHash`] hashing.
 #[cfg_attr(feature = "bevy_reflect", derive(Reflect))]

crates/bevy_ecs/src/entity/index_set.rs

@@ -20,7 +20,7 @@ use indexmap::set::{self, IndexSet};
 
 use super::{Entity, EntityHash, EntitySetIterator};
 
-use bevy_platform_support::prelude::Box;
+use bevy_platform::prelude::Box;
 
 /// An [`IndexSet`] pre-configured to use [`EntityHash`] hashing.
 #[cfg_attr(feature = "serialize", derive(serde::Deserialize, serde::Serialize))]

crates/bevy_ecs/src/entity/map_entities.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 
 use alloc::{collections::VecDeque, vec::Vec};
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use core::hash::BuildHasher;
 use smallvec::SmallVec;
 
@@ -24,7 +24,7 @@ use smallvec::SmallVec;
 /// entities in the context of scenes and entity cloning, which generally uses [`MapEntities`] internally
 /// to map each field (see those docs for usage).
 ///
-/// [`HashSet<Entity>`]: bevy_platform_support::collections::HashSet
+/// [`HashSet<Entity>`]: bevy_platform::collections::HashSet
 ///
 /// ## Example
 ///

crates/bevy_ecs/src/entity/mod.rs

@@ -83,7 +83,7 @@ use crate::{
     storage::{SparseSetIndex, TableId, TableRow},
 };
 use alloc::vec::Vec;
-use bevy_platform_support::sync::atomic::Ordering;
+use bevy_platform::sync::atomic::Ordering;
 use core::{fmt, hash::Hash, mem, num::NonZero, panic::Location};
 use log::warn;
 
@@ -91,7 +91,7 @@ use log::warn;
 use serde::{Deserialize, Serialize};
 
 #[cfg(target_has_atomic = "64")]
-use bevy_platform_support::sync::atomic::AtomicI64 as AtomicIdCursor;
+use bevy_platform::sync::atomic::AtomicI64 as AtomicIdCursor;
 #[cfg(target_has_atomic = "64")]
 type IdCursor = i64;
 
@@ -99,7 +99,7 @@ type IdCursor = i64;
 /// do not. This fallback allows compilation using a 32-bit cursor instead, with
 /// the caveat that some conversions may fail (and panic) at runtime.
 #[cfg(not(target_has_atomic = "64"))]
-use bevy_platform_support::sync::atomic::AtomicIsize as AtomicIdCursor;
+use bevy_platform::sync::atomic::AtomicIsize as AtomicIdCursor;
 #[cfg(not(target_has_atomic = "64"))]
 type IdCursor = isize;
 

crates/bevy_ecs/src/entity/unique_array.rs

@@ -18,7 +18,7 @@ use alloc::{
     vec::Vec,
 };
 
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 
 use super::{
     unique_slice::{self, UniqueEntityEquivalentSlice},

crates/bevy_ecs/src/entity/unique_slice.rs

@@ -22,7 +22,7 @@ use alloc::{
     vec::Vec,
 };
 
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 
 use super::{
     unique_vec::{self, UniqueEntityEquivalentVec},

crates/bevy_ecs/src/entity/unique_vec.rs

@@ -17,7 +17,7 @@ use alloc::{
     vec::{self, Vec},
 };
 
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 
 use super::{
     unique_slice::{self, UniqueEntityEquivalentSlice},

crates/bevy_ecs/src/error/handler.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "configurable_error_handler")]
-use bevy_platform_support::sync::OnceLock;
+use bevy_platform::sync::OnceLock;
 use core::fmt::Display;
 
 use crate::{component::Tick, error::BevyError};

crates/bevy_ecs/src/intern.rs

@@ -5,7 +5,7 @@
 //! and make comparisons for any type as fast as integers.
 
 use alloc::{borrow::ToOwned, boxed::Box};
-use bevy_platform_support::{
+use bevy_platform::{
     collections::HashSet,
     hash::FixedHasher,
     sync::{PoisonError, RwLock},
@@ -170,7 +170,7 @@ impl<T: ?Sized> Default for Interner<T> {
 #[cfg(test)]
 mod tests {
     use alloc::{boxed::Box, string::ToString};
-    use bevy_platform_support::hash::FixedHasher;
+    use bevy_platform::hash::FixedHasher;
     use core::hash::{BuildHasher, Hash, Hasher};
 
     use crate::intern::{Internable, Interned, Interner};

crates/bevy_ecs/src/lib.rs

@@ -146,7 +146,7 @@ mod tests {
         vec,
         vec::Vec,
     };
-    use bevy_platform_support::collections::HashSet;
+    use bevy_platform::collections::HashSet;
     use bevy_tasks::{ComputeTaskPool, TaskPool};
     use core::{
         any::TypeId,

crates/bevy_ecs/src/name.rs

@@ -6,7 +6,7 @@ use alloc::{
     borrow::{Cow, ToOwned},
     string::String,
 };
-use bevy_platform_support::hash::FixedHasher;
+use bevy_platform::hash::FixedHasher;
 use core::{
     hash::{BuildHasher, Hash, Hasher},
     ops::Deref,

crates/bevy_ecs/src/observer/mod.rs

@@ -17,7 +17,7 @@ use crate::{
     world::{DeferredWorld, *},
 };
 use alloc::vec::Vec;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_ptr::Ptr;
 use core::{
     fmt::Debug,
@@ -843,7 +843,7 @@ impl World {
 mod tests {
     use alloc::{vec, vec::Vec};
 
-    use bevy_platform_support::collections::HashMap;
+    use bevy_platform::collections::HashMap;
     use bevy_ptr::OwningPtr;
 
     use crate::component::ComponentId;

crates/bevy_ecs/src/query/par_iter.rs

@@ -205,7 +205,7 @@ impl<'w, 's, D: ReadOnlyQueryData, F: QueryFilter, E: EntityEquivalent + Sync>
     /// use bevy_utils::Parallel;
     /// use crate::{bevy_ecs::prelude::{Component, Res, Resource, Entity}, bevy_ecs::system::Query};
     /// # use core::slice;
-    /// use bevy_platform_support::prelude::Vec;
+    /// use bevy_platform::prelude::Vec;
     /// # fn some_expensive_operation(_item: &T) -> usize {
     /// #     0
     /// # }

crates/bevy_ecs/src/relationship/related_methods.rs

@@ -7,7 +7,7 @@ use crate::{
     system::{Commands, EntityCommands},
     world::{EntityWorldMut, World},
 };
-use bevy_platform_support::prelude::{Box, Vec};
+use bevy_platform::prelude::{Box, Vec};
 use core::{marker::PhantomData, mem};
 
 use super::OrderedRelationshipSourceCollection;

crates/bevy_ecs/src/schedule/auto_insert_apply_deferred.rs

@@ -1,6 +1,6 @@
 use alloc::{boxed::Box, collections::BTreeSet, vec::Vec};
 
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 
 use crate::system::IntoSystem;
 use crate::world::World;

crates/bevy_ecs/src/schedule/executor/multi_threaded.rs

@@ -1,5 +1,5 @@
 use alloc::{boxed::Box, vec::Vec};
-use bevy_platform_support::sync::Arc;
+use bevy_platform::sync::Arc;
 use bevy_tasks::{ComputeTaskPool, Scope, TaskPool, ThreadExecutor};
 use bevy_utils::{default, syncunsafecell::SyncUnsafeCell};
 use concurrent_queue::ConcurrentQueue;

crates/bevy_ecs/src/schedule/graph/graph_map.rs

@@ -5,7 +5,7 @@
 //! [`petgraph`]: https://docs.rs/petgraph/0.6.5/petgraph/
 
 use alloc::vec::Vec;
-use bevy_platform_support::{collections::HashSet, hash::FixedHasher};
+use bevy_platform::{collections::HashSet, hash::FixedHasher};
 use core::{
     fmt,
     hash::{BuildHasher, Hash},

crates/bevy_ecs/src/schedule/graph/mod.rs

@@ -5,7 +5,7 @@ use core::{
 };
 use smallvec::SmallVec;
 
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_utils::TypeIdMap;
 
 use fixedbitset::FixedBitSet;

crates/bevy_ecs/src/schedule/schedule.rs

@@ -11,7 +11,7 @@ use alloc::{
     vec,
     vec::Vec,
 };
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_utils::{default, TypeIdMap};
 use core::{
     any::{Any, TypeId},

crates/bevy_ecs/src/schedule/stepping.rs

@@ -4,7 +4,7 @@ use crate::{
     system::{IntoSystem, ResMut},
 };
 use alloc::vec::Vec;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_utils::TypeIdMap;
 use core::any::TypeId;
 use fixedbitset::FixedBitSet;

crates/bevy_ecs/src/storage/table/mod.rs

@@ -6,7 +6,7 @@ use crate::{
     storage::{blob_vec::BlobVec, ImmutableSparseSet, SparseSet},
 };
 use alloc::{boxed::Box, vec, vec::Vec};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_ptr::{OwningPtr, Ptr, UnsafeCellDeref};
 pub use column::*;
 use core::{

crates/bevy_ecs/src/world/entity_ref.rs

@@ -27,7 +27,7 @@ use crate::{
     },
 };
 use alloc::vec::Vec;
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_ptr::{OwningPtr, Ptr};
 use core::{
     any::TypeId,
@@ -250,7 +250,7 @@ impl<'w> EntityRef<'w> {
     /// ## [`HashSet`] of [`ComponentId`]s
     ///
     /// ```
-    /// # use bevy_platform_support::collections::HashSet;
+    /// # use bevy_platform::collections::HashSet;
     /// # use bevy_ecs::{prelude::*, component::ComponentId};
     /// #
     /// # #[derive(Component, PartialEq, Debug)]
@@ -792,7 +792,7 @@ impl<'w> EntityMut<'w> {
     /// ## [`HashSet`] of [`ComponentId`]s
     ///
     /// ```
-    /// # use bevy_platform_support::collections::HashSet;
+    /// # use bevy_platform::collections::HashSet;
     /// # use bevy_ecs::{prelude::*, component::ComponentId};
     /// #
     /// # #[derive(Component, PartialEq, Debug)]

crates/bevy_ecs/src/world/identifier.rs

@@ -4,7 +4,7 @@ use crate::{
     system::{ExclusiveSystemParam, ReadOnlySystemParam, SystemMeta, SystemParam},
     world::{FromWorld, World},
 };
-use bevy_platform_support::sync::atomic::{AtomicUsize, Ordering};
+use bevy_platform::sync::atomic::{AtomicUsize, Ordering};
 
 use super::unsafe_world_cell::UnsafeWorldCell;
 

crates/bevy_ecs/src/world/mod.rs

@@ -67,7 +67,7 @@ use crate::{
     },
 };
 use alloc::{boxed::Box, vec::Vec};
-use bevy_platform_support::sync::atomic::{AtomicU32, Ordering};
+use bevy_platform::sync::atomic::{AtomicU32, Ordering};
 use bevy_ptr::{OwningPtr, Ptr, UnsafeCellDeref};
 use core::{any::TypeId, fmt};
 use log::warn;
@@ -3781,7 +3781,7 @@ mod tests {
         vec::Vec,
     };
     use bevy_ecs_macros::Component;
-    use bevy_platform_support::collections::{HashMap, HashSet};
+    use bevy_platform::collections::{HashMap, HashSet};
     use core::{
         any::TypeId,
         panic,

crates/bevy_ecs/src/world/unsafe_world_cell.rs

@@ -15,7 +15,7 @@ use crate::{
     storage::{ComponentSparseSet, Storages, Table},
     world::RawCommandQueue,
 };
-use bevy_platform_support::sync::atomic::Ordering;
+use bevy_platform::sync::atomic::Ordering;
 use bevy_ptr::{Ptr, UnsafeCellDeref};
 use core::{any::TypeId, cell::UnsafeCell, fmt::Debug, marker::PhantomData, panic::Location, ptr};
 use thiserror::Error;

crates/bevy_gilrs/Cargo.toml

@@ -15,7 +15,7 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.16.0-rc.4" }
 bevy_input = { path = "../bevy_input", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
 bevy_time = { path = "../bevy_time", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
 ] }
 

crates/bevy_gilrs/src/lib.rs

@@ -24,7 +24,7 @@ use bevy_app::{App, Plugin, PostUpdate, PreStartup, PreUpdate};
 use bevy_ecs::entity::EntityHashMap;
 use bevy_ecs::prelude::*;
 use bevy_input::InputSystem;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use gilrs::GilrsBuilder;
 use gilrs_system::{gilrs_event_startup_system, gilrs_event_system};
 use rumble::{play_gilrs_rumble, RunningRumbleEffects};

crates/bevy_gilrs/src/rumble.rs

@@ -2,7 +2,7 @@
 use crate::{Gilrs, GilrsGamepads};
 use bevy_ecs::prelude::{EventReader, Res, ResMut, Resource};
 use bevy_input::gamepad::{GamepadRumbleIntensity, GamepadRumbleRequest};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_time::{Real, Time};
 use bevy_utils::synccell::SyncCell;
 use core::time::Duration;

crates/bevy_gltf/Cargo.toml

@@ -37,7 +37,7 @@ bevy_scene = { path = "../bevy_scene", version = "0.16.0-rc.4", features = [
 bevy_transform = { path = "../bevy_transform", version = "0.16.0-rc.4" }
 bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
   "serialize",
 ] }
@@ -74,7 +74,7 @@ bevy_log = { path = "../bevy_log", version = "0.16.0-rc.4", default-features = f
 bevy_app = { path = "../bevy_app", version = "0.16.0-rc.4", default-features = false, features = [
   "web",
 ] }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "web",
 ] }
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-rc.4", default-features = false, features = [

crates/bevy_gltf/src/assets.rs

@@ -6,7 +6,7 @@ use bevy_asset::{Asset, Handle};
 use bevy_ecs::{component::Component, reflect::ReflectComponent};
 use bevy_mesh::{skinning::SkinnedMeshInverseBindposes, Mesh};
 use bevy_pbr::StandardMaterial;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use bevy_reflect::{prelude::ReflectDefault, Reflect, TypePath};
 use bevy_scene::Scene;
 

crates/bevy_gltf/src/lib.rs

@@ -97,7 +97,7 @@ mod vertex_attributes;
 
 extern crate alloc;
 
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 
 use bevy_app::prelude::*;
 use bevy_asset::AssetApp;

crates/bevy_gltf/src/loader/gltf_ext/mod.rs

@@ -5,7 +5,7 @@ pub mod mesh;
 pub mod scene;
 pub mod texture;
 
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 
 use fixedbitset::FixedBitSet;
 use gltf::{Document, Gltf};

crates/bevy_gltf/src/loader/gltf_ext/scene.rs

@@ -8,7 +8,7 @@ use fixedbitset::FixedBitSet;
 use itertools::Itertools;
 
 #[cfg(feature = "bevy_animation")]
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 
 use crate::GltfError;
 

crates/bevy_gltf/src/loader/mod.rs

@@ -35,7 +35,7 @@ use bevy_pbr::UvChannel;
 use bevy_pbr::{
     DirectionalLight, MeshMaterial3d, PointLight, SpotLight, StandardMaterial, MAX_JOINTS,
 };
-use bevy_platform_support::collections::{HashMap, HashSet};
+use bevy_platform::collections::{HashMap, HashSet};
 use bevy_render::{
     camera::{Camera, OrthographicProjection, PerspectiveProjection, Projection, ScalingMode},
     mesh::Mesh3d,

crates/bevy_gltf/src/vertex_attributes.rs

@@ -1,5 +1,5 @@
 use bevy_mesh::{Mesh, MeshVertexAttribute, VertexAttributeValues as Values, VertexFormat};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use gltf::{
     accessor::{DataType, Dimensions},
     mesh::util::{ReadColors, ReadJoints, ReadTexCoords, ReadWeights},

crates/bevy_image/Cargo.toml

@@ -32,11 +32,7 @@ qoi = ["image/qoi"]
 tga = ["image/tga"]
 tiff = ["image/tiff"]
 webp = ["image/webp"]
-serialize = [
+serialize = ["bevy_reflect", "bevy_platform/serialize", "bevy_utils/serde"]
-  "bevy_reflect",
-  "bevy_platform_support/serialize",
-  "bevy_utils/serde",
-]
 
 # For ktx2 supercompression
 zlib = ["flate2"]
@@ -53,7 +49,7 @@ bevy_color = { path = "../bevy_color", version = "0.16.0-rc.4", features = [
 bevy_math = { path = "../bevy_math", version = "0.16.0-rc.4" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
 ] }
 

crates/bevy_image/src/texture_atlas.rs

@@ -1,7 +1,7 @@
 use bevy_app::prelude::*;
 use bevy_asset::{Asset, AssetApp as _, AssetId, Assets, Handle};
 use bevy_math::{Rect, URect, UVec2};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 #[cfg(not(feature = "bevy_reflect"))]
 use bevy_reflect::TypePath;
 #[cfg(feature = "bevy_reflect")]

crates/bevy_image/src/texture_atlas_builder.rs

@@ -1,6 +1,6 @@
 use bevy_asset::{AssetId, RenderAssetUsages};
 use bevy_math::{URect, UVec2};
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use rectangle_pack::{
     contains_smallest_box, pack_rects, volume_heuristic, GroupedRectsToPlace, PackedLocation,
     RectToInsert, TargetBin,

crates/bevy_input/Cargo.toml

@@ -27,7 +27,7 @@ serialize = [
   "smol_str?/serde",
   "bevy_ecs/serialize",
   "bevy_math/serialize",
-  "bevy_platform_support/serialize",
+  "bevy_platform/serialize",
 ]
 
 ## Uses the small-string optimization provided by `smol_str`.
@@ -44,7 +44,7 @@ std = [
   "bevy_math/std",
   "bevy_utils/std",
   "bevy_reflect/std",
-  "bevy_platform_support/std",
+  "bevy_platform/std",
 ]
 
 ## `critical-section` provides the building blocks for synchronization primitives
@@ -53,7 +53,7 @@ critical-section = [
   "bevy_app/critical-section",
   "bevy_ecs/critical-section",
   "bevy_reflect?/critical-section",
-  "bevy_platform_support/critical-section",
+  "bevy_platform/critical-section",
 ]
 
 ## Uses the `libm` maths library instead of the one provided in `std` and `core`.
@@ -68,7 +68,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4", default-features
 bevy_reflect = { path = "../bevy_reflect", version = "0.16.0-rc.4", features = [
   "glam",
 ], default-features = false, optional = true }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false }
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false }
 
 # other
 serde = { version = "1", features = [

crates/bevy_input/src/axis.rs

@@ -1,7 +1,7 @@
 //! The generic axis type.
 
 use bevy_ecs::resource::Resource;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 use core::hash::Hash;
 
 #[cfg(feature = "bevy_reflect")]

crates/bevy_input/src/button_input.rs

@@ -1,7 +1,7 @@
 //! The generic input type.
 
 use bevy_ecs::resource::Resource;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use core::hash::Hash;
 #[cfg(feature = "bevy_reflect")]
 use {

crates/bevy_input/src/gamepad.rs

@@ -16,7 +16,7 @@ use bevy_ecs::{
 };
 use bevy_math::ops;
 use bevy_math::Vec2;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 #[cfg(feature = "bevy_reflect")]
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 #[cfg(all(feature = "serialize", feature = "bevy_reflect"))]

crates/bevy_input/src/touch.rs

@@ -7,7 +7,7 @@ use bevy_ecs::{
     system::ResMut,
 };
 use bevy_math::Vec2;
-use bevy_platform_support::collections::HashMap;
+use bevy_platform::collections::HashMap;
 #[cfg(feature = "bevy_reflect")]
 use bevy_reflect::Reflect;
 

crates/bevy_internal/Cargo.toml

@@ -113,7 +113,7 @@ serialize = [
   "bevy_ui?/serialize",
   "bevy_window?/serialize",
   "bevy_winit?/serialize",
-  "bevy_platform_support/serialize",
+  "bevy_platform/serialize",
 ]
 multi_threaded = [
   "std",
@@ -306,7 +306,7 @@ std = [
   "bevy_input_focus?/std",
   "bevy_log/std",
   "bevy_math/std",
-  "bevy_platform_support/std",
+  "bevy_platform/std",
   "bevy_reflect/std",
   "bevy_state?/std",
   "bevy_time/std",
@@ -325,7 +325,7 @@ critical-section = [
   "bevy_ecs/critical-section",
   "bevy_input/critical-section",
   "bevy_input_focus?/critical-section",
-  "bevy_platform_support/critical-section",
+  "bevy_platform/critical-section",
   "bevy_reflect/critical-section",
   "bevy_state?/critical-section",
   "bevy_time/critical-section",
@@ -357,7 +357,7 @@ async_executor = [
 web = [
   "bevy_app/web",
   "bevy_log/web",
-  "bevy_platform_support/web",
+  "bevy_platform/web",
   "bevy_reflect/web",
   "bevy_tasks/web",
 ]
@@ -379,7 +379,7 @@ bevy_math = { path = "../bevy_math", version = "0.16.0-rc.4", default-features =
   "bevy_reflect",
   "nostd-libm",
 ] }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "alloc",
 ] }
 bevy_ptr = { path = "../bevy_ptr", version = "0.16.0-rc.4", default-features = false }

crates/bevy_internal/src/lib.rs

@@ -48,7 +48,7 @@ pub use bevy_math as math;
 pub use bevy_pbr as pbr;
 #[cfg(feature = "bevy_picking")]
 pub use bevy_picking as picking;
-pub use bevy_platform_support as platform_support;
+pub use bevy_platform as platform;
 pub use bevy_ptr as ptr;
 pub use bevy_reflect as reflect;
 #[cfg(feature = "bevy_remote")]

crates/bevy_internal/src/prelude.rs

@@ -1,7 +1,7 @@
 #[doc(hidden)]
 pub use crate::{
     app::prelude::*, ecs::prelude::*, input::prelude::*, log::prelude::*, math::prelude::*,
-    platform_support::prelude::*, reflect::prelude::*, time::prelude::*, transform::prelude::*,
+    platform::prelude::*, reflect::prelude::*, time::prelude::*, transform::prelude::*,
     utils::prelude::*, DefaultPlugins, MinimalPlugins,
 };
 

crates/bevy_mesh/Cargo.toml

@@ -19,7 +19,7 @@ bevy_transform = { path = "../bevy_transform", version = "0.16.0-rc.4" }
 bevy_mikktspace = { path = "../bevy_mikktspace", version = "0.16.0-rc.4" }
 bevy_derive = { path = "../bevy_derive", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
   "serialize",
 ] }

crates/bevy_mesh/src/primitives/dim2.rs

@@ -1176,7 +1176,7 @@ impl From<Capsule2d> for Mesh {
 #[cfg(test)]
 mod tests {
     use bevy_math::{prelude::Annulus, primitives::RegularPolygon, FloatOrd};
-    use bevy_platform_support::collections::HashSet;
+    use bevy_platform::collections::HashSet;
 
     use crate::{Mesh, MeshBuilder, Meshable, VertexAttributeValues};
 

crates/bevy_mesh/src/vertex.rs

@@ -2,7 +2,7 @@ use alloc::sync::Arc;
 use bevy_derive::EnumVariantMeta;
 use bevy_ecs::resource::Resource;
 use bevy_math::Vec3;
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use bytemuck::cast_slice;
 use core::hash::{Hash, Hasher};
 use thiserror::Error;

crates/bevy_pbr/Cargo.toml

@@ -46,7 +46,7 @@ bevy_tasks = { path = "../bevy_tasks", version = "0.16.0-rc.4", optional = true
 bevy_transform = { path = "../bevy_transform", version = "0.16.0-rc.4" }
 bevy_utils = { path = "../bevy_utils", version = "0.16.0-rc.4" }
 bevy_window = { path = "../bevy_window", version = "0.16.0-rc.4" }
-bevy_platform_support = { path = "../bevy_platform_support", version = "0.16.0-rc.4", default-features = false, features = [
+bevy_platform = { path = "../bevy_platform", version = "0.16.0-rc.4", default-features = false, features = [
   "std",
 ] }
 

crates/bevy_pbr/src/cluster/mod.rs

@@ -13,7 +13,7 @@ use bevy_ecs::{
     world::{FromWorld, World},
 };
 use bevy_math::{uvec4, AspectRatio, UVec2, UVec3, UVec4, Vec3Swizzles as _, Vec4};
-use bevy_platform_support::collections::HashSet;
+use bevy_platform::collections::HashSet;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::{
     camera::Camera,