Skip to content

Commit 78dc109

Browse files
authored
Rollup merge of #95757 - zofrex:gender-neutral-terms, r=dtolnay
Use gender neutral terms #95508 was not executed well, but it did find a couple of legitimate issues: some uses of unnecessarily gendered language, and some typos. This PR fixes (properly) the legitimate issues it found.
2 parents 7333f06 + 6c1d22c commit 78dc109

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

std/src/fs/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,9 +644,9 @@ fn recursive_rmdir_toctou() {
644644
// Test for time-of-check to time-of-use issues.
645645
//
646646
// Scenario:
647-
// The attacker wants to get directory contents deleted, to which he does not have access.
648-
// He has a way to get a privileged Rust binary call `std::fs::remove_dir_all()` on a
649-
// directory he controls, e.g. in his home directory.
647+
// The attacker wants to get directory contents deleted, to which they do not have access.
648+
// They have a way to get a privileged Rust binary call `std::fs::remove_dir_all()` on a
649+
// directory they control, e.g. in their home directory.
650650
//
651651
// The POC sets up the `attack_dest/attack_file` which the attacker wants to have deleted.
652652
// The attacker repeatedly creates a directory and replaces it with a symlink from

std/src/thread/local.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ pub mod fast {
980980
unsafe fn try_initialize<F: FnOnce() -> T>(&self, init: F) -> Option<&'static T> {
981981
// SAFETY: See comment above (this function doc).
982982
if !mem::needs_drop::<T>() || unsafe { self.try_register_dtor() } {
983-
// SAFETY: See comment above (his function doc).
983+
// SAFETY: See comment above (this function doc).
984984
Some(unsafe { self.inner.initialize(init) })
985985
} else {
986986
None

0 commit comments

Comments
 (0)