Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev' into more-build-diagnostics
Browse files Browse the repository at this point in the history
  • Loading branch information
melody-rs committed Aug 16, 2024
2 parents e0707b3 + 0cb37c6 commit 99e163f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion crates/core/src/data_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ impl Data {
.wrap_err("While serializing .luminol/commands")?;
filesystem
.write(".luminol/commands", command_db)
.wrap_err("While writing .luminol/config")?;
.wrap_err("While writing .luminol/commands")?;

// even though Ini uses fmt::write internally, it provides no easy way to write to a string.
// so we need to open a file instead
Expand Down
3 changes: 2 additions & 1 deletion crates/filesystem/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ pub trait FileSystem: Send + Sync {
}

/// Corresponds to [`std::fs::write()`].
/// Will open a file at the path, create it if it exists (and truncate it) and then write the provided bytes.
/// Will open a file at the path, create it if it does not exist (and truncate it)
/// and then write the provided bytes.
fn write(&self, path: impl AsRef<camino::Utf8Path>, data: impl AsRef<[u8]>) -> Result<()> {
use std::io::Write;

Expand Down

0 comments on commit 99e163f

Please sign in to comment.