Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some warnings #9724

Merged
merged 2 commits into from
Sep 8, 2023
Merged

Fix some warnings #9724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ede6d55
fix warn(unused_doc_comments)
ameknite Sep 8, 2023
a4c8a02
fix warn(elided_lifetimes_in_associated_constant)
ameknite Sep 8, 2023
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
4 changes: 2 additions & 2 deletions crates/bevy_asset/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ impl Default for AssetPlugin {
}

impl AssetPlugin {
const DEFAULT_FILE_SOURCE: &str = "assets";
const DEFAULT_FILE_SOURCE: &'static str = "assets";
/// NOTE: this is in the Default sub-folder to make this forward compatible with "import profiles"
/// and to allow us to put the "processor transaction log" at `imported_assets/log`
const DEFAULT_FILE_DESTINATION: &str = "imported_assets/Default";
const DEFAULT_FILE_DESTINATION: &'static str = "imported_assets/Default";

/// Returns the default [`AssetPlugin::Processed`] configuration
pub fn processed() -> Self {
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_pbr/src/light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ use crate::{
#[reflect(Component, Default)]
pub struct PointLight {
pub color: Color,
/// Luminous power in lumens
pub intensity: f32,
pub range: f32,
pub radius: f32,
Expand All @@ -59,7 +60,6 @@ impl Default for PointLight {
fn default() -> Self {
PointLight {
color: Color::rgb(1.0, 1.0, 1.0),
/// Luminous power in lumens
intensity: 800.0, // Roughly a 60W non-halogen incandescent bulb
range: 20.0,
radius: 0.0,
Expand Down Expand Up @@ -95,6 +95,7 @@ impl Default for PointLightShadowMap {
#[reflect(Component, Default)]
pub struct SpotLight {
pub color: Color,
/// Luminous power in lumens
pub intensity: f32,
pub range: f32,
pub radius: f32,
Expand Down Expand Up @@ -127,7 +128,6 @@ impl Default for SpotLight {
// a quarter arc attenuating from the center
Self {
color: Color::rgb(1.0, 1.0, 1.0),
/// Luminous power in lumens
intensity: 800.0, // Roughly a 60W non-halogen incandescent bulb
range: 20.0,
radius: 0.0,
Expand Down