Skip to content

Commit f60138a

Browse files
committed
Auto merge of #105017 - matthiaskrgr:rollup-j0x550l, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #104804 (Rename `ast::Lit` as `ast::MetaItemLit`.) - #104891 (Add documentation for `has_escaping_bound_vars`) - #104933 (interpret: remove PartialOrd from a bunch of types that do not have or need a sensible order) - #104936 (Ignore bivariant parameters in test_type_match.) - #104954 (make simple check of prinf function) - #104956 (Avoid ICE if the Clone trait is not found while building error suggestions) - #104982 (interpret: get rid of run() function) - #104998 (Update my mailmap) - #105006 (stricter alignment enforcement for ScalarPair) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9fd7f7e + 5d3ede2 commit f60138a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/concurrency/data_race.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl ThreadClockSet {
158158

159159
/// Error returned by finding a data race
160160
/// should be elaborated upon.
161-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
161+
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
162162
pub struct DataRace;
163163

164164
/// Externally stored memory cell clocks

0 commit comments

Comments
 (0)