Skip to content

Commit 15e2d98

Browse files
committed
Auto merge of #114585 - matthiaskrgr:rollup-h26pvus, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #113568 (Fix spurious test failure with `panic=abort`) - #114196 (Bubble up nested goals from equation in `predicates_for_object_candidate`) - #114485 (Add trait decls to SMIR) - #114495 (Set max_atomic_width for AVR to 16) - #114496 (Set max_atomic_width for sparc-unknown-linux-gnu to 32) - #114510 (llvm-wrapper: adapt for LLVM API changes) - #114562 (stabilize abi_thiscall) - #114570 ([miri][typo] Fix a typo in a vector_block comment.) - #114573 (CI: do not hide error logs in a group) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b403311 + a126a64 commit 15e2d98

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/concurrency/vector_clock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::{
99

1010
/// A vector clock index, this is associated with a thread id
1111
/// but in some cases one vector index may be shared with
12-
/// multiple thread ids if it safe to do so.
12+
/// multiple thread ids if it's safe to do so.
1313
#[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
1414
pub struct VectorIdx(u32);
1515

0 commit comments

Comments
 (0)