After a hash mismatch error, emit file-system paths of crates involved. #13284
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix rust-lang#13266. There is a little bit of acrobatics in the definition of `crate_paths` to avoid calling `clone()` on the dylib/rlib unless we actually are going to need them. The other oddity is that I have replaced the `root_ident: Option<&str>` parameter with a `root: &Option<CratePaths>`, which may surprise one who was expecting to see something like: `root: Option<&CratePaths>`. I went with the approach here because I could not come up with code for the alternative that was acceptable to the borrow checker.
| @@ -338,7 +371,8 @@ impl<'a> Context<'a> { | |||
| None => true, | |||
| Some(myhash) => { | |||
| if *myhash != hash { | |||
| self.rejected_via_hash = true; | |||
| self.rejected_via_hash = | |||
| Some(ViaHash{ path: libpath.clone(), }); | |||
There was a problem hiding this comment.
This could also be a vector to collect all rejected candidates rather than just one (although most of the time there will only be one)
There was a problem hiding this comment.
I'll look into doing that
|
This should have a test in one of the test suites. There's an example in |
Add way to print notes with just file:linenum prefix (preserving integration with source lookup for e.g. vi and emacs) but don't repeat the other span info.
(i.e. semi-generalized version of prior errorinfo gathering.) Also revised presentation to put each path on its own line, prefixed by file:linenum information.
All it checks, unfortunately, is that you actually printed at least two lines for crateA paths and at least one line for crateB paths. But that's enough to capture the spirit of the bug, I think. I did not bother trying to verify that the paths themselves reflected where the crates end up.
|
So okay, the output now looks like this, when you run rustc on |
bors
added a commit
that referenced
this pull request
Apr 5, 2014
…r=alexcrichton Fix #13266. There is a little bit of acrobatics in the definition of `crate_paths` to avoid calling `clone()` on the dylib/rlib unless we actually are going to need them. The other oddity is that I have replaced the `root_ident: Option<&str>` parameter with a `root: &Option<CratePaths>`, which may surprise one who was expecting to see something like: `root: Option<&CratePaths>`. I went with the approach here because I could not come up with code for the alternative that was acceptable to the borrow checker.
Jarcho
pushed a commit
to Jarcho/rust
that referenced
this pull request
Aug 24, 2024
Improve `collapsible_match` error message syntax fixes rust-lang#13283 changelog: none
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #13266.
There is a little bit of acrobatics in the definition of
crate_pathsto avoid calling
clone()on the dylib/rlib unless we actually aregoing to need them.
The other oddity is that I have replaced the
root_ident: Option<&str>parameter with a
root: &Option<CratePaths>, which may surprise onewho was expecting to see something like:
root: Option<&CratePaths>.I went with the approach here because I could not come up with code for
the alternative that was acceptable to the borrow checker.