Skip to content

Commit da5c61d

Browse files
author
Jakub Bukaj
committed
rollup merge of #19038: jayelm/fixed-typos
Baby steps here... Fixed some comments in liblog, libregex, librustc, libstd.
2 parents de05565 + 215f693 commit da5c61d

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/liblog/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
//! includes 'foo'.
138138
//! * `info/f.o` turns on all info logging where the log message includes 'foo',
139139
//! 'f1o', 'fao', etc.
140-
//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the the log
140+
//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the log
141141
//! message includes 'foofoo' or 'fofoo' or 'fooooooofoo', etc.
142142
//! * `error,hello=warn/[0-9] scopes` turn on global error logging and also warn for
143143
//! hello. In both cases the log message must include a single digit number

src/libregex/re.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ pub struct NoExpand<'t>(pub &'t str);
561561
/// Replacer describes types that can be used to replace matches in a string.
562562
pub trait Replacer {
563563
/// Returns a possibly owned string that is used to replace the match
564-
/// corresponding the the `caps` capture group.
564+
/// corresponding to the `caps` capture group.
565565
///
566566
/// The `'a` lifetime refers to the lifetime of a borrowed string when
567567
/// a new owned string isn't needed (e.g., for `NoExpand`).

src/librustc/middle/traits/select.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
351351
// matches this obligation, then we can assume that the
352352
// obligation is satisfied for now (still all other conditions
353353
// must be met of course). One obvious case this comes up is
354-
// marker traits like `Send`. Think of a a linked list:
354+
// marker traits like `Send`. Think of a linked list:
355355
//
356356
// struct List<T> { data: T, next: Option<Box<List<T>>> {
357357
//

src/libstd/collections/hash/table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ impl<'a, K, V> Iterator<RawBucket<K, V>> for RawBuckets<'a, K, V> {
718718
}
719719

720720
/// An iterator that moves out buckets in reverse order. It leaves the table
721-
/// in an an inconsistent state and should only be used for dropping
721+
/// in an inconsistent state and should only be used for dropping
722722
/// the table's remaining entries. It's used in the implementation of Drop.
723723
struct RevMoveBuckets<'a, K, V> {
724724
raw: RawBucket<K, V>,

src/libstd/os.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const BUF_BYTES : uint = 2048u;
8181
/// # Failure
8282
///
8383
/// Fails if the current working directory value is invalid:
84-
/// Possibles cases:
84+
/// Possible cases:
8585
///
8686
/// * Current directory does not exist.
8787
/// * There are insufficient permissions to access the current directory.

0 commit comments

Comments
 (0)