bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Consider all fields when comparing DllImports, to remove nondetermininsm in multiple-definitions test

Browse source
This commit is contained in:
Richard Cobbe 2021-07-12 12:46:27 -07:00
parent b5a2ccee81
commit ce59f1aac5
7 changed files with 91 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/middle/cstore.rs
View file

@ -66,7 +66,7 @@ pub enum LinkagePreference {
RequireStatic,
}
#[derive(Clone, Debug, Encodable, Decodable, HashStable)]
#[derive(Debug, Encodable, Decodable, HashStable)]
pub struct NativeLib {
pub kind: NativeLibKind,
pub name: Option<Symbol>,
@ -77,7 +77,7 @@ pub struct NativeLib {
pub dll_imports: Vec<DllImport>,
}
#[derive(Clone, Debug, PartialEq, Eq, Encodable, Decodable, Hash, HashStable)]
#[derive(Clone, Debug, Encodable, Decodable, HashStable)]
pub struct DllImport {
pub name: Symbol,
pub ordinal: Option<u16>,
@ -94,7 +94,7 @@ pub struct DllImport {
///
/// The usize value, where present, indicates the size of the function's argument list
/// in bytes.
#[derive(Copy, Clone, Debug, PartialEq, Eq, Encodable, Decodable, Hash, HashStable)]
#[derive(Clone, PartialEq, Debug, Encodable, Decodable, HashStable)]
pub enum DllCallingConvention {
C,
Stdcall(usize),