Skip to content

Commit d907ab8

Browse files
authored
Rollup merge of rust-lang#95757 - zofrex:gender-neutral-terms, r=dtolnay
Use gender neutral terms rust-lang#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 6639604 + ef59ab7 commit d907ab8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

compiler/rustc_expand/src/mbe/macro_parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ pub(super) fn count_metavar_decls(matcher: &[TokenTree]) -> usize {
315315
/// only on the nesting depth of repetitions in the originating token tree it
316316
/// was derived from.
317317
///
318-
/// In layman's terms: `NamedMatch` will form a tree representing nested matches of a particular
318+
/// In layperson's terms: `NamedMatch` will form a tree representing nested matches of a particular
319319
/// meta variable. For example, if we are matching the following macro against the following
320320
/// invocation...
321321
///

compiler/rustc_typeck/src/check/wfcheck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1657,7 +1657,7 @@ fn receiver_is_valid<'fcx, 'tcx>(
16571657
}
16581658
} else {
16591659
debug!("receiver_is_valid: type `{:?}` does not deref to `{:?}`", receiver_ty, self_ty);
1660-
// If he receiver already has errors reported due to it, consider it valid to avoid
1660+
// If the receiver already has errors reported due to it, consider it valid to avoid
16611661
// unnecessary errors (#58712).
16621662
return receiver_ty.references_error();
16631663
}

compiler/rustc_typeck/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2700,7 +2700,7 @@ fn linkage_by_name(tcx: TyCtxt<'_>, def_id: DefId, name: &str) -> Linkage {
27002700
// Use the names from src/llvm/docs/LangRef.rst here. Most types are only
27012701
// applicable to variable declarations and may not really make sense for
27022702
// Rust code in the first place but allow them anyway and trust that the
2703-
// user knows what s/he's doing. Who knows, unanticipated use cases may pop
2703+
// user knows what they're doing. Who knows, unanticipated use cases may pop
27042704
// up in the future.
27052705
//
27062706
// ghost, dllimport, dllexport and linkonce_odr_autohide are not supported

library/std/src/fs/tests.rs

+3-3
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

library/std/src/thread/local.rs

+1-1
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)