Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions crates/bevy_asset/src/io/file/sync_file_asset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ impl AssetReader for FileAssetReader {
f.ok().and_then(|dir_entry| {
let path = dir_entry.path();
// filter out meta files as they are not considered assets
if let Some(ext) = path.extension().and_then(|e| e.to_str()) {
if ext.eq_ignore_ascii_case("meta") {
return None;
}
if let Some(ext) = path.extension().and_then(|e| e.to_str())
&& ext.eq_ignore_ascii_case("meta")
{
return None;
}
// filter out hidden files. they are not listed by default but are directly targetable
if path
Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_math/src/bounding/bounded2d/primitive_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ use crate::{
bounding::BoundingVolume,
ops,
primitives::{
Annulus, Arc2d, Capsule2d, Circle, CircularSector, CircularSegment, ConvexPolygon, Ellipse,
Line2d, Plane2d, Rectangle, RegularPolygon, Rhombus, Segment2d, Triangle2d,
Annulus, Arc2d, Capsule2d, Circle, CircularSector, CircularSegment, Ellipse, Line2d,
Plane2d, Rectangle, RegularPolygon, Rhombus, Segment2d, Triangle2d,
},
Dir2, Isometry2d, Mat2, Rot2, Vec2,
};
use core::f32::consts::{FRAC_PI_2, PI, TAU};

#[cfg(feature = "alloc")]
use crate::primitives::{Polygon, Polyline2d};
use crate::primitives::{ConvexPolygon, Polygon, Polyline2d};

use smallvec::SmallVec;

Expand Down
1 change: 1 addition & 0 deletions crates/bevy_math/src/bounding/bounded3d/extrusion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ impl BoundedExtrusion for Rectangle {
}
}

#[cfg(feature = "alloc")]
impl BoundedExtrusion for Polygon {
fn extrusion_aabb_3d(&self, half_depth: f32, isometry: impl Into<Isometry3d>) -> Aabb3d {
let isometry = isometry.into();
Expand Down
2 changes: 2 additions & 0 deletions crates/bevy_math/src/primitives/dim2.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use core::f32::consts::{FRAC_1_SQRT_2, FRAC_PI_2, FRAC_PI_3, PI};
use derive_more::derive::From;
#[cfg(feature = "alloc")]
use thiserror::Error;

use super::{Measured2d, Primitive2d, WindingOrder};
Expand Down Expand Up @@ -1996,6 +1997,7 @@ impl ConvexPolygon {
}
}

#[cfg(feature = "alloc")]
impl TryFrom<Polygon> for ConvexPolygon {
type Error = ConvexPolygonError;

Expand Down
1 change: 1 addition & 0 deletions crates/bevy_reflect/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ pub mod __macro_exports {
}
}

#[cfg(any(feature = "auto_register_static", feature = "auto_register_inventory"))]
pub use __automatic_type_registration_impl::*;
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_utils/src/debug_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl Deref for DebugName {
#[cfg(feature = "debug")]
return &self.name;
#[cfg(not(feature = "debug"))]
return &FEATURE_DISABLED;
return FEATURE_DISABLED;
}
}

Expand Down
Loading