Remove nondeterminism in multiple-definitions test#87092
Remove nondeterminism in multiple-definitions test#87092bors merged 1 commit intorust-lang:masterfrom
Conversation
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
|
Question for reviewers: in an earlier version of this code, a reviewer asked me not to have |
|
I don't think it is nondeterministic when you compared the names, so I don't think the issue is that simple. |
The error message is triggered in precisely the case where we have multiple |
|
My version of the fix, with all unnecessary impls removed, and with explicit sorting removed too - petrochenkov@8b9ce0e (Not tested on |
I'm happy to just go with that; what's the workflow to do that? |
|
@ricobbe |
Ok, I've tried that, and now the restored (and renamed) multiple-declarations.rs test is failing. I've run it with Everything else looks reasonable; in particular, I'm seeing the expected diagnostics on stderr. I've tried running the test with the EDIT: with @wesleywiser's help, I was able to figure out why rustc was terminating with an exit code of 0 for this test despite the error message; a little bit of plumbing sufficed to get this fixed up. I'll push shortly. |
|
r=me after addressing #87092 (comment) and squashing commits. |
…nsm in multiple-definitions test
928ca03 to
ce59f1a
Compare
|
@rustbot label -S-waiting-on-author +S-waiting-on-review |
|
@bors r=petrochenkov rollup |
|
📌 Commit ce59f1a has been approved by |
…nitions, r=petrochenkov Remove nondeterminism in multiple-definitions test Compare all fields in `DllImport` when sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function. Restore the multiple-definitions test. Resolves rust-lang#87084.
Rollup of 8 pull requests Successful merges: - rust-lang#86763 (Add a regression test for issue-63355) - rust-lang#86814 (Recover from a misplaced inner doc comment) - rust-lang#86843 (Check that const parameters of trait methods have compatible types) - rust-lang#86889 (rustdoc: Cleanup ExternalCrate) - rust-lang#87092 (Remove nondeterminism in multiple-definitions test) - rust-lang#87170 (Add diagnostic items for Clippy) - rust-lang#87183 (fix typo in compile_fail doctest) - rust-lang#87205 (rustc_middle: remove redundant clone) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
…nitions, r=petrochenkov Remove nondeterminism in multiple-definitions test Compare all fields in `DllImport` when sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function. Restore the multiple-definitions test. Resolves rust-lang#87084.
Compare all fields in
DllImportwhen sorting to avoid nondeterminism in the error for multiple inconsistent definitions of an extern function. Restore the multiple-definitions test.Resolves #87084.