Skip to content

Commit

Permalink
Auto merge of #10603 - epage:toml, r=ehuss
Browse files Browse the repository at this point in the history
chore: Upgrade toml_edit

### What does this PR try to resolve?

This upgrades toml_edit and tries to make future upgrades easier.  To do this, it officially adds `toml_edit` to the public API but this will let RLS use these errors and stay up-to-date without manual intervention.

### How should we test and review this PR?

The main question is if we should have toml_edit in the API

### Additional information

See rust-lang/rls#1764
  • Loading branch information
bors committed Apr 27, 2022
2 parents 7a3b56b + de77eb1 commit 5600004
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ strip-ansi-escapes = "0.1.0"
tar = { version = "0.4.36", default-features = false }
tempfile = "3.0"
termcolor = "1.1"
toml_edit = { version = "0.13.4", features = ["serde", "easy"] }
toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] }
unicode-xid = "0.2.0"
url = "2.2.2"
walkdir = "2.2"
Expand Down
3 changes: 3 additions & 0 deletions src/cargo/util/toml/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ use crate::util::{
mod targets;
use self::targets::targets;

pub use toml_edit::de::Error as TomlDeError;
pub use toml_edit::TomlError as TomlEditError;

/// Loads a `Cargo.toml` from a file on disk.
///
/// This could result in a real or virtual manifest being returned.
Expand Down

0 comments on commit 5600004

Please sign in to comment.