Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Use ManifestError & ResolveError APIs to highlight workspace member Cargo.toml errors #1089

Merged

Conversation

alexheretic
Copy link
Member

@alexheretic alexheretic commented Oct 15, 2018

Following #1079 and rust-lang/cargo#6157 we can use cargo ManifestError chains & ResolveErrors to discern a more precise manifest in the workspace to highlight as erroneous.

This means things like toml parse errors in a member manifest will be correctly targeted in a diagnostic.

member-manifest-diagnostic

I've also added ResolveError support following the rust-lang/cargo#6175 merge. This allows us to find a member manifest when reporting dependency resolution errors during workspace compilation.


  • cargo & clippy updated inline with current rust-lang/rust submodules (required for new cargo functionality)
  • cargo update

@alexheretic alexheretic force-pushed the workspace-member-manifest-diagnostics branch 2 times, most recently from cd208fe to 6ed5231 Compare October 17, 2018 22:16
@alexheretic alexheretic force-pushed the workspace-member-manifest-diagnostics branch from 6ed5231 to 3e45874 Compare October 21, 2018 10:11
@alexheretic
Copy link
Member Author

alexheretic commented Oct 21, 2018

This is now ready to go as cargo is new enough in rust-lang/rust.

@alexheretic alexheretic changed the title Use ManifestError chain to highlight workspace member Cargo.toml errors Use ManifestError & ResolveError APIs to highlight workspace member Cargo.toml errors Oct 21, 2018
Update cargo -> 2d0863f657e6f45159fc7412267eee3e659185e5
Update clippy 5afdf8b78507ddf015d192858aef56e72c17de16
@alexheretic alexheretic force-pushed the workspace-member-manifest-diagnostics branch from 3e45874 to 27da9fd Compare October 21, 2018 10:20
@Xanewok
Copy link
Member

Xanewok commented Oct 22, 2018

That's a wonderful addition, thanks! Sorry it took some time to review.

bors r+

@Xanewok
Copy link
Member

Xanewok commented Oct 22, 2018

Hm, bors has a hard time catching up (maybe due to recent GitHub issues)? This seems to be the newest commit on master and the CI looks green, so let's give it a try!

@Xanewok Xanewok merged commit a822c73 into rust-lang:master Oct 22, 2018
@bors-voyager
Copy link
Contributor

bors-voyager bot commented Oct 22, 2018

Not awaiting review

@alexheretic alexheretic deleted the workspace-member-manifest-diagnostics branch October 24, 2018 11:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants