nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-03 05:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18386 from Wilfred/missing_offset

Browse Source 
fix: Handle missing time offsets gracefully
This commit is contained in:
Laurențiu Nicola 2024-10-23 17:15:23 +00:00 committed by GitHub
commit 7dad963782
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/rust-analyzer/crates/rust-analyzer/src/tracing/config.rs
View File

@ -58,14 +58,22 @@ where
let writer = self.writer; let writer = self.writer;
let ra_fmt_layer = tracing_subscriber::fmt::layer() let ra_fmt_layer = tracing_subscriber::fmt::layer()
.with_timer(
time::OffsetTime::local_rfc_3339()
.expect("Could not get local offset, make sure you're on the main thread"),
)
.with_target(false) .with_target(false)
.with_ansi(false) .with_ansi(false)
.with_writer(writer) .with_writer(writer);
.with_filter(targets_filter);
let ra_fmt_layer = match time::OffsetTime::local_rfc_3339() {
Ok(timer) => {
// If we can get the time offset, format logs with the timezone.
ra_fmt_layer.with_timer(timer).boxed()
}
Err(_) => {
// Use system time if we can't get the time offset. This should
// never happen on Linux, but can happen on e.g. OpenBSD.
ra_fmt_layer.boxed()
}
}
.with_filter(targets_filter);
let chalk_layer = match self.chalk_filter { let chalk_layer = match self.chalk_filter {
Some(chalk_filter) => { Some(chalk_filter) => {