Skip to content

Commit 5600004

Browse files
committed
Auto merge of #10603 - epage:toml, r=ehuss
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
2 parents 7a3b56b + de77eb1 commit 5600004

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ strip-ansi-escapes = "0.1.0"
5858
tar = { version = "0.4.36", default-features = false }
5959
tempfile = "3.0"
6060
termcolor = "1.1"
61-
toml_edit = { version = "0.13.4", features = ["serde", "easy"] }
61+
toml_edit = { version = "0.14.3", features = ["serde", "easy", "perf"] }
6262
unicode-xid = "0.2.0"
6363
url = "2.2.2"
6464
walkdir = "2.2"

src/cargo/util/toml/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ use crate::util::{
3636
mod targets;
3737
use self::targets::targets;
3838

39+
pub use toml_edit::de::Error as TomlDeError;
40+
pub use toml_edit::TomlError as TomlEditError;
41+
3942
/// Loads a `Cargo.toml` from a file on disk.
4043
///
4144
/// This could result in a real or virtual manifest being returned.

0 commit comments

Comments
 (0)