Skip to content

Commit aed2980

Browse files
committed
Merge branch 'main' into spare-cap
2 parents 7cd8806 + 9a2e0af commit aed2980

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use core::{
1616
///
1717
/// // A vector with a fixed capacity of 8 elements allocated on the stack
1818
/// let mut vec = Vec::<_, 8>::new();
19-
/// vec.push(1);
20-
/// vec.push(2);
19+
/// vec.push(1).unwrap();
20+
/// vec.push(2).unwrap();
2121
///
2222
/// assert_eq!(vec.len(), 2);
2323
/// assert_eq!(vec[0], 1);

tests/tsan.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#![deny(rust_2018_idioms)]
33
#![deny(warnings)]
44

5-
use std::thread;
5+
use std::{ptr::addr_of_mut, thread};
66

77
use heapless::spsc;
88

99
#[test]
1010
fn once() {
1111
static mut RB: spsc::Queue<i32, 4> = spsc::Queue::new();
1212

13-
let rb = unsafe { &mut RB };
13+
let rb = unsafe { &mut *addr_of_mut!(RB) };
1414

1515
rb.enqueue(0).unwrap();
1616

@@ -31,7 +31,7 @@ fn once() {
3131
fn twice() {
3232
static mut RB: spsc::Queue<i32, 5> = spsc::Queue::new();
3333

34-
let rb = unsafe { &mut RB };
34+
let rb = unsafe { &mut *addr_of_mut!(RB) };
3535

3636
rb.enqueue(0).unwrap();
3737
rb.enqueue(1).unwrap();

0 commit comments

Comments
 (0)