Skip to content

Commit d5408f3

Browse files
committed
Auto merge of #23507 - jbcrail:fix-comment-spelling, r=alexcrichton
I corrected misspelled comments in several crates.
2 parents 0084f92 + 857035a commit d5408f3

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

src/libcore/str/pattern.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use super::CharEq;
2525
///
2626
/// The trait itself acts as a builder for an associated
2727
/// `Searcher` type, which does the actual work of finding
28-
/// occurences of the pattern in a string.
28+
/// occurrences of the pattern in a string.
2929
pub trait Pattern<'a>: Sized {
3030
/// Associated searcher for this pattern
3131
type Searcher: Searcher<'a>;
@@ -72,7 +72,7 @@ pub enum SearchStep {
7272
/// Expresses that `haystack[a..b]` has been rejected as a possible match
7373
/// of the pattern.
7474
///
75-
/// Note that there might be more than one `Reject` betwen two `Match`es,
75+
/// Note that there might be more than one `Reject` between two `Match`es,
7676
/// there is no requirement for them to be combined into one.
7777
Reject(usize, usize),
7878
/// Expresses that every byte of the haystack has been visted, ending

src/librbml/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ pub mod writer {
10611061
}
10621062

10631063
/// Returns the current position while marking it stable, i.e.
1064-
/// generated bytes so far woundn't be affected by relaxation.
1064+
/// generated bytes so far wouldn't be affected by relaxation.
10651065
pub fn mark_stable_position(&mut self) -> u64 {
10661066
let pos = self.writer.seek(SeekFrom::Current(0)).unwrap();
10671067
if self.relax_limit < pos {

src/librustc_trans/trans/type_of.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ pub fn arg_type_of<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, t: Ty<'tcx>) -> Type {
264264
}
265265

266266
/// Get the LLVM type corresponding to a Rust type, i.e. `middle::ty::Ty`.
267-
/// This is the right LLVM type for an alloca containg a value of that type,
267+
/// This is the right LLVM type for an alloca containing a value of that type,
268268
/// and the pointee of an Lvalue Datum (which is always a LLVM pointer).
269269
/// For unsized types, the returned type is a fat pointer, thus the resulting
270270
/// LLVM type for a `Trait` Lvalue is `{ i8*, void(i8*)** }*`, which is a double

src/librustc_typeck/check/regionck.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
225225
/// }
226226
/// ```
227227
///
228-
/// Here, the region of `b` will be `<R0>`. `<R0>` is constrainted to be some subregion of the
228+
/// Here, the region of `b` will be `<R0>`. `<R0>` is constrained to be some subregion of the
229229
/// block B and some superregion of the call. If we forced it now, we'd choose the smaller
230230
/// region (the call). But that would make the *b illegal. Since we don't resolve, the type
231231
/// of b will be `&<R0>.int` and then `*b` will require that `<R0>` be bigger than the let and

src/librustc_typeck/check/upvar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ impl<'a,'tcx> AdjustBorrowKind<'a,'tcx> {
294294

295295
/// Indicates that `cmt` is being directly mutated (e.g., assigned
296296
/// to). If cmt contains any by-ref upvars, this implies that
297-
/// those upvars must be borrowed using an `&mut` borow.
297+
/// those upvars must be borrowed using an `&mut` borrow.
298298
fn adjust_upvar_borrow_kind_for_mut(&mut self, cmt: mc::cmt<'tcx>) {
299299
debug!("adjust_upvar_borrow_kind_for_mut(cmt={})",
300300
cmt.repr(self.tcx()));

src/libstd/io/stdio.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use io::{self, BufReader, LineWriter};
1919
use sync::{Arc, Mutex, MutexGuard};
2020
use sys::stdio;
2121

22-
/// Stdout used by print! and println! macroses
22+
/// Stdout used by print! and println! macros
2323
thread_local! {
2424
static LOCAL_STDOUT: RefCell<Option<Box<Write + Send>>> = {
2525
RefCell::new(None)

src/libstd/sys/common/rwlock.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl RWLock {
2525
/// thread to do so.
2626
///
2727
/// Behavior is undefined if the rwlock has been moved between this and any
28-
/// previous methodo call.
28+
/// previous method call.
2929
#[inline]
3030
pub unsafe fn read(&self) { self.0.read() }
3131

@@ -35,15 +35,15 @@ impl RWLock {
3535
/// This function does not block the current thread.
3636
///
3737
/// Behavior is undefined if the rwlock has been moved between this and any
38-
/// previous methodo call.
38+
/// previous method call.
3939
#[inline]
4040
pub unsafe fn try_read(&self) -> bool { self.0.try_read() }
4141

4242
/// Acquire write access to the underlying lock, blocking the current thread
4343
/// to do so.
4444
///
4545
/// Behavior is undefined if the rwlock has been moved between this and any
46-
/// previous methodo call.
46+
/// previous method call.
4747
#[inline]
4848
pub unsafe fn write(&self) { self.0.write() }
4949

@@ -53,7 +53,7 @@ impl RWLock {
5353
/// This function does not block the current thread.
5454
///
5555
/// Behavior is undefined if the rwlock has been moved between this and any
56-
/// previous methodo call.
56+
/// previous method call.
5757
#[inline]
5858
pub unsafe fn try_write(&self) -> bool { self.0.try_write() }
5959

src/libsyntax/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ pub enum Expr_ {
913913

914914
/// The explicit Self type in a "qualified path". The actual
915915
/// path, including the trait and the associated item, is stored
916-
/// sepparately. `position` represents the index of the associated
916+
/// separately. `position` represents the index of the associated
917917
/// item qualified with this Self type.
918918
///
919919
/// <Vec<T> as a::b::Trait>::AssociatedItem

0 commit comments

Comments
 (0)