mirror of
https://github.com/bevyengine/bevy
synced 2024-12-30 06:53:13 +00:00
d70595b667
# Objective - Fixes #6370 - Closes #6581 ## Solution - Added the following lints to the workspace: - `std_instead_of_core` - `std_instead_of_alloc` - `alloc_instead_of_core` - Used `cargo +nightly fmt` with [item level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Item%5C%3A) to split all `use` statements into single items. - Used `cargo clippy --workspace --all-targets --all-features --fix --allow-dirty` to _attempt_ to resolve the new linting issues, and intervened where the lint was unable to resolve the issue automatically (usually due to needing an `extern crate alloc;` statement in a crate root). - Manually removed certain uses of `std` where negative feature gating prevented `--all-features` from finding the offending uses. - Used `cargo +nightly fmt` with [crate level use formatting](https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#Crate%5C%3A) to re-merge all `use` statements matching Bevy's previous styling. - Manually fixed cases where the `fmt` tool could not re-merge `use` statements due to conditional compilation attributes. ## Testing - Ran CI locally ## Migration Guide The MSRV is now 1.81. Please update to this version or higher. ## Notes - This is a _massive_ change to try and push through, which is why I've outlined the semi-automatic steps I used to create this PR, in case this fails and someone else tries again in the future. - Making this change has no impact on user code, but does mean Bevy contributors will be warned to use `core` and `alloc` instead of `std` where possible. - This lint is a critical first step towards investigating `no_std` options for Bevy. --------- Co-authored-by: François Mockers <francois.mockers@vleue.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
diff --git a/crates/bevy_audio/src/audio_output.rs b/crates/bevy_audio/src/audio_output.rs
|
|
index 3e8082e23..624769443 100644
|
|
--- a/crates/bevy_audio/src/audio_output.rs
|
|
+++ b/crates/bevy_audio/src/audio_output.rs
|
|
@@ -7,7 +7,7 @@ use bevy_ecs::{prelude::*, system::SystemParam};
|
|
use bevy_math::Vec3;
|
|
use bevy_transform::prelude::GlobalTransform;
|
|
use bevy_utils::tracing::warn;
|
|
-use rodio::{OutputStream, OutputStreamHandle, Sink, Source, SpatialSink};
|
|
+use rodio::{OutputStreamHandle, Sink, Source, SpatialSink};
|
|
|
|
use crate::AudioSink;
|
|
|
|
@@ -30,18 +30,10 @@ pub(crate) struct AudioOutput {
|
|
|
|
impl Default for AudioOutput {
|
|
fn default() -> Self {
|
|
- if let Ok((stream, stream_handle)) = OutputStream::try_default() {
|
|
- // We leak `OutputStream` to prevent the audio from stopping.
|
|
- core::mem::forget(stream);
|
|
- Self {
|
|
- stream_handle: Some(stream_handle),
|
|
- }
|
|
- } else {
|
|
warn!("No audio device found.");
|
|
Self {
|
|
stream_handle: None,
|
|
}
|
|
- }
|
|
}
|
|
}
|
|
|