Commit f6afd2e

committed

Clarify panic-drop test for select_unpredictable

1 parent 7d7fe3f commit f6afd2eCopy full SHA for f6afd2e

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ fn select_unpredictable_drop() {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`#[test]`
`26`		`-#[should_panic]`
	`26`	`+#[should_panic = "message canary"]`
`27`	`27`	`fn select_unpredictable_drop_on_panic() {`
`28`	`28`	`use core::cell::Cell;`
`29`	`29`
`@@ -37,7 +37,7 @@ fn select_unpredictable_drop_on_panic() {`
`37`	`37`	`fn drop(&mut self) {`
`38`	`38`	`let value = self.cell.get();`
`39`	`39`	`self.cell.set(self.write);`
`40`		`- assert_eq!(value, self.expect);`
	`40`	`+ assert_eq!(value, self.expect,"message canary");`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`@@ -55,6 +55,8 @@ fn select_unpredictable_drop_on_panic() {`
`55`	`55`	// 3. `armed` drops during unwind, writes 0 and does not panic as 0xdead == 0xdead
`56`	`56`	`//`
`57`	`57`	// If `selected` is not dropped, `armed` panics as 1 != 0xdead
`58`		`- let _unreachable =`
`59`		`- core::hint::select_unpredictable(core::hint::black_box(true), selected, unselected);`
	`58`	`+ let _unreachable = core::hint::select_unpredictable(true, selected, unselected);`
	`59`	`+`
	`60`	+ // If this panics we do not match the `should_panic` expectation.
	`61`	`+ unreachable!();`
`60`	`62`	`}`

Comments

(0)