Rollup merge of #126281 - ChrisDenton:env, r=jhpratt · model-checking/verify-rust-std@5760a4e (original) (raw)

Original file line number Diff line number Diff line change
@@ -323,8 +323,10 @@ impl Error for VarError {
323 323 /// This function is also always safe to call on Windows, in single-threaded
324 324 /// and multi-threaded programs.
325 325 ///
326 -/// In multi-threaded programs on other operating systems, we strongly suggest
327 -/// not using `set_var` or `remove_var` at all. The exact requirement is: you
326 +/// In multi-threaded programs on other operating systems, the only safe option is
327 +/// to not use `set_var` or `remove_var` at all.
328 +///
329 +/// The exact requirement is: you
328 330 /// must ensure that there are no other threads concurrently writing or
329 331 /// *reading*(!) the environment through functions or global variables other
330 332 /// than the ones in this module. The problem is that these operating systems
@@ -390,8 +392,10 @@ unsafe fn _set_var(key: &OsStr, value: &OsStr) {
390 392 /// This function is also always safe to call on Windows, in single-threaded
391 393 /// and multi-threaded programs.
392 394 ///
393 -/// In multi-threaded programs on other operating systems, we strongly suggest
394 -/// not using `set_var` or `remove_var` at all. The exact requirement is: you
395 +/// In multi-threaded programs on other operating systems, the only safe option is
396 +/// to not use `set_var` or `remove_var` at all.
397 +///
398 +/// The exact requirement is: you
395 399 /// must ensure that there are no other threads concurrently writing or
396 400 /// *reading*(!) the environment through functions or global variables other
397 401 /// than the ones in this module. The problem is that these operating systems