mirror of
https://github.com/bevyengine/bevy
synced 2024-12-21 10:33:08 +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>
99 lines
3.1 KiB
Rust
99 lines
3.1 KiB
Rust
use alloc::ffi::CString;
|
|
use bevy_utils::tracing::{
|
|
field::Field,
|
|
span::{Attributes, Record},
|
|
Event, Id, Level, Subscriber,
|
|
};
|
|
use core::fmt::{Debug, Write};
|
|
use tracing_subscriber::{field::Visit, layer::Context, registry::LookupSpan, Layer};
|
|
|
|
#[derive(Default)]
|
|
pub(crate) struct AndroidLayer;
|
|
|
|
struct StringRecorder(String, bool);
|
|
impl StringRecorder {
|
|
fn new() -> Self {
|
|
StringRecorder(String::new(), false)
|
|
}
|
|
}
|
|
|
|
impl Visit for StringRecorder {
|
|
fn record_debug(&mut self, field: &Field, value: &dyn Debug) {
|
|
if field.name() == "message" {
|
|
if !self.0.is_empty() {
|
|
self.0 = format!("{:?}\n{}", value, self.0)
|
|
} else {
|
|
self.0 = format!("{:?}", value)
|
|
}
|
|
} else {
|
|
if self.1 {
|
|
// following args
|
|
write!(self.0, " ").unwrap();
|
|
} else {
|
|
// first arg
|
|
self.1 = true;
|
|
}
|
|
write!(self.0, "{} = {:?};", field.name(), value).unwrap();
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Default for StringRecorder {
|
|
fn default() -> Self {
|
|
StringRecorder::new()
|
|
}
|
|
}
|
|
|
|
impl<S: Subscriber + for<'a> LookupSpan<'a>> Layer<S> for AndroidLayer {
|
|
fn on_new_span(&self, attrs: &Attributes<'_>, id: &Id, ctx: Context<'_, S>) {
|
|
let mut new_debug_record = StringRecorder::new();
|
|
attrs.record(&mut new_debug_record);
|
|
|
|
if let Some(span_ref) = ctx.span(id) {
|
|
span_ref
|
|
.extensions_mut()
|
|
.insert::<StringRecorder>(new_debug_record);
|
|
}
|
|
}
|
|
|
|
fn on_record(&self, id: &Id, values: &Record<'_>, ctx: Context<'_, S>) {
|
|
if let Some(span_ref) = ctx.span(id) {
|
|
if let Some(debug_record) = span_ref.extensions_mut().get_mut::<StringRecorder>() {
|
|
values.record(debug_record);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
fn on_event(&self, event: &Event<'_>, _ctx: Context<'_, S>) {
|
|
fn sanitize(string: &str) -> CString {
|
|
let bytes: Vec<u8> = string
|
|
.as_bytes()
|
|
.into_iter()
|
|
.copied()
|
|
.filter(|byte| *byte != 0)
|
|
.collect();
|
|
CString::new(bytes).unwrap()
|
|
}
|
|
|
|
let mut recorder = StringRecorder::new();
|
|
event.record(&mut recorder);
|
|
let meta = event.metadata();
|
|
let priority = match *meta.level() {
|
|
Level::TRACE => android_log_sys::LogPriority::VERBOSE,
|
|
Level::DEBUG => android_log_sys::LogPriority::DEBUG,
|
|
Level::INFO => android_log_sys::LogPriority::INFO,
|
|
Level::WARN => android_log_sys::LogPriority::WARN,
|
|
Level::ERROR => android_log_sys::LogPriority::ERROR,
|
|
};
|
|
// SAFETY: Called only on Android platforms. priority is guaranteed to be in range of c_int.
|
|
// The provided tag and message are null terminated properly.
|
|
unsafe {
|
|
android_log_sys::__android_log_write(
|
|
priority as android_log_sys::c_int,
|
|
sanitize(meta.name()).as_ptr(),
|
|
sanitize(&recorder.0).as_ptr(),
|
|
);
|
|
}
|
|
}
|
|
}
|