Commit bce5253

authored

Rollup merge of rust-lang#123118 - tgross35:rwlock-docs, r=workingjubilee

Update `RwLock` deadlock example to not use shadowing Tweak variable names in the deadlock example to remove any potential confusion that the behavior is somehow shadowing-related.

2 parents 19a40ec + 0cd5772 commit bce5253Copy full SHA for bce5253

File tree

1 file changed

-6

lines changed

library/std/src/sync
- rwlock.rs

1 file changed

-6

lines changed

`‎library/std/src/sync/rwlock.rs‎`

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,14 @@ use crate::sys::sync as sys;`
`31`	`31`	`/// <details><summary>Potential deadlock example</summary>`
`32`	`32`	`///`
`33`	`33`	/// ```text
`34`		`-/// // Thread 1 \| // Thread 2`
`35`		`-/// let _rg = lock.read(); \|`
`36`		`-/// \| // will block`
`37`		`-/// \| let _wg = lock.write();`
`38`		`-/// // may deadlock \|`
`39`		`-/// let _rg = lock.read(); \|`
	`34`	`+/// // Thread 1 \| // Thread 2`
	`35`	`+/// let _rg1 = lock.read(); \|`
	`36`	`+/// \| // will block`
	`37`	`+/// \| let _wg = lock.write();`
	`38`	`+/// // may deadlock \|`
	`39`	`+/// let _rg2 = lock.read(); \|`
`40`	`40`	/// ```
	`41`	`+///`
`41`	`42`	`/// </details>`
`42`	`43`	`///`
`43`	`44`	/// The type parameter `T` represents the data that this lock protects. It is

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit bce5253

File tree

1 file changed

1 file changed

`‎library/std/src/sync/rwlock.rs‎`

0 commit comments