itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(manifest): Clarify which diagnostic source

Browse Source
This commit is contained in:
Ed Page 2025-09-08 15:58:48 -05:00
parent 378bc91cd6
commit 433457447c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cargo/util/toml/mod.rs
View File

@ -69,10 +69,10 @@ pub fn read_manifest(
let is_embedded = is_embedded(path); let is_embedded = is_embedded(path);
let contents = read_toml_string(path, is_embedded, gctx) let contents = read_toml_string(path, is_embedded, gctx)
.map_err(|err| ManifestError::new(err, path.into()))?; .map_err(|err| ManifestError::new(err, path.into()))?;
let document = let document = parse_document(&contents)
parse_document(&contents).map_err(|e| emit_diagnostic(e.into(), &contents, path, gctx))?; .map_err(|e| emit_toml_diagnostic(e.into(), &contents, path, gctx))?;
let original_toml = deserialize_toml(&document) let original_toml = deserialize_toml(&document)
.map_err(|e| emit_diagnostic(e.into(), &contents, path, gctx))?; .map_err(|e| emit_toml_diagnostic(e.into(), &contents, path, gctx))?;
let mut manifest = (|| { let mut manifest = (|| {
let empty = Vec::new(); let empty = Vec::new();
@ -2777,7 +2777,7 @@ fn lints_to_rustflags(lints: &manifest::TomlLints) -> CargoResult<Vec<String>> {
Ok(rustflags) Ok(rustflags)
} }
fn emit_diagnostic( fn emit_toml_diagnostic(
e: toml::de::Error, e: toml::de::Error,
contents: &str, contents: &str,
manifest_file: &Path, manifest_file: &Path,