about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-18 14:21:56 +0900
committerGitHub <noreply@github.com>2021-07-18 14:21:56 +0900
commitd7c3c45d685403e090d84956da9e4d1a82ca6666 (patch)
treed4a780e0e5b853eb3481066353be8b634bb27d81
parente643b8b56123d81c30bda7c82d1b8a00e47a8c43 (diff)
parentb47198aaa1531fe8b470ca56d9cfa41dbbbc335d (diff)
downloadrust-d7c3c45d685403e090d84956da9e4d1a82ca6666.tar.gz
rust-d7c3c45d685403e090d84956da9e4d1a82ca6666.zip
Rollup merge of #87092 - ricobbe:fix-raw-dylib-multiple-definitions, 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 #87084.
-rw-r--r--src/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index cb1cb3c74db..e32dae49131 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -221,9 +221,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
             sess,
             &codegen_results,
             outputs,
-        );
-
-        Ok(())
+        )
     }
 }