diff options
| author | bors <bors@rust-lang.org> | 2017-07-24 20:15:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-24 20:15:21 +0000 |
| commit | 598eddf4f785df12e79fba5a996f153dc6fdb7e0 (patch) | |
| tree | 3fb84fd0a941dcfa2aaf1d627259301732b0ec42 /src/libcore | |
| parent | b80e946101dd49dd1864b6229f9430c55036c7ce (diff) | |
| parent | 0bb4291295b672d53edf816b5bde2d78c110d654 (diff) | |
| download | rust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.tar.gz rust-598eddf4f785df12e79fba5a996f153dc6fdb7e0.zip | |
Auto merge of #43454 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 11 pull requests - Successful merges: #43297, #43322, #43342, #43361, #43366, #43374, #43379, #43401, #43421, #43428, #43446 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/str/mod.rs | 2 | ||||
| -rw-r--r-- | src/libcore/str/pattern.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index 1df69a1b598..95b27751a6a 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -847,7 +847,7 @@ macro_rules! generate_pattern_iterators { internal: $internal_iterator:ident yielding ($iterty:ty); - // Kind of delgation - either single ended or double ended + // Kind of delegation - either single ended or double ended delegate $($t:tt)* } => { $(#[$forward_iterator_attribute])* diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs index 3c9c1d6cab4..c4ff95b1d6a 100644 --- a/src/libcore/str/pattern.rs +++ b/src/libcore/str/pattern.rs @@ -83,7 +83,7 @@ pub enum SearchStep { /// Note that there might be more than one `Reject` between two `Match`es, /// there is no requirement for them to be combined into one. Reject(usize, usize), - /// Expresses that every byte of the haystack has been visted, ending + /// Expresses that every byte of the haystack has been visited, ending /// the iteration. Done } @@ -101,7 +101,7 @@ pub enum SearchStep { /// the haystack. This enables consumers of this trait to /// slice the haystack without additional runtime checks. pub unsafe trait Searcher<'a> { - /// Getter for the underlaying string to be searched in + /// Getter for the underlying string to be searched in /// /// Will always return the same `&str` fn haystack(&self) -> &'a str; @@ -1153,7 +1153,7 @@ impl TwoWaySearcher { // The maximal suffix is a possible critical factorization (u', v') of `arr`. // // Returns `i` where `i` is the starting index of v', from the back; - // returns immedately when a period of `known_period` is reached. + // returns immediately when a period of `known_period` is reached. // // `order_greater` determines if lexical order is `<` or `>`. Both // orders must be computed -- the ordering with the largest `i` gives |
