Skip to content

Commit

Permalink
Rollup merge of #125898 - RalfJung:typo, r=Nilstrieb
Browse files Browse the repository at this point in the history
typo: depending from -> on
  • Loading branch information
workingjubilee authored Jun 2, 2024
2 parents 18a46be + 361c6a5 commit 72ea7e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion library/core/src/str/pattern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ pub unsafe trait ReverseSearcher<'a>: Searcher<'a> {
///
/// `(&str)::Searcher` is not a `DoubleEndedSearcher` because
/// the pattern `"aa"` in the haystack `"aaa"` matches as either
/// `"[aa]a"` or `"a[aa]"`, depending from which side it is searched.
/// `"[aa]a"` or `"a[aa]"`, depending on which side it is searched.
pub trait DoubleEndedSearcher<'a>: ReverseSearcher<'a> {}

/////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/sys/thread_local/fast_local/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Thread local support for platforms with native TLS.
//!
//! To achieve the best performance, we choose from four different types for
//! the TLS variable, depending from the method of initialization used (`const`
//! the TLS variable, depending on the method of initialization used (`const`
//! or lazy) and the drop requirements of the stored type:
//!
//! | | `Drop` | `!Drop` |
Expand Down

0 comments on commit 72ea7e9

Please sign in to comment.