Skip to content

Commit 2ee02b2

Browse files
committed
Rollup merge of #31514 - cgar:spelling, r=alexcrichton
2 parents 2208f96 + 02aa0af commit 2ee02b2

File tree

19 files changed

+20
-20
lines changed

19 files changed

+20
-20
lines changed

src/doc/book/error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ fn map<F, T, A>(option: Option<T>, f: F) -> Option<A> where F: FnOnce(T) -> A {
265265
```
266266

267267
Indeed, `map` is [defined as a method][2] on `Option<T>` in the standard library.
268-
As a method, it has a slighly different signature: methods take `self`, `&self`,
268+
As a method, it has a slightly different signature: methods take `self`, `&self`,
269269
or `&mut self` as their first argument.
270270

271271
Armed with our new combinator, we can rewrite our `extension_explicit` method

src/libbacktrace/ansidecl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* ANSI and traditional C compatability macros
1+
/* ANSI and traditional C compatibility macros
22
Copyright (C) 1991-2015 Free Software Foundation, Inc.
33
This file is part of the GNU C Library.
44

src/libcollections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// }
2929
// ```
3030
//
31-
// Since Rust doesn't acutally have dependent types and polymorphic recursion,
31+
// Since Rust doesn't actually have dependent types and polymorphic recursion,
3232
// we make do with lots of unsafety.
3333

3434
use alloc::heap;

src/libcollections/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@ impl str {
18081808
// Σ maps to σ, except at the end of a word where it maps to ς.
18091809
// This is the only conditional (contextual) but language-independent mapping
18101810
// in `SpecialCasing.txt`,
1811-
// so hard-code it rather than have a generic "condition" mechanim.
1811+
// so hard-code it rather than have a generic "condition" mechanism.
18121812
// See https://github.com/rust-lang/rust/issues/26035
18131813
map_uppercase_sigma(self, i, &mut s)
18141814
} else {

src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ use boxed::Box;
193193
/// mem::forget(story);
194194
///
195195
/// // We can re-build a String out of ptr, len, and capacity. This is all
196-
/// // unsafe becuase we are responsible for making sure the components are
196+
/// // unsafe because we are responsible for making sure the components are
197197
/// // valid:
198198
/// let s = unsafe { String::from_raw_parts(ptr as *mut _, len, capacity) } ;
199199
///

src/libcore/convert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//!
2020
//! - Impl the `As*` traits for reference-to-reference conversions
2121
//! - Impl the `Into` trait when you want to consume the value in the conversion
22-
//! - The `From` trait is the most flexible, usefull for values _and_ references conversions
22+
//! - The `From` trait is the most flexible, useful for values _and_ references conversions
2323
//!
2424
//! As a library writer, you should prefer implementing `From<T>` rather than
2525
//! `Into<U>`, as `From` provides greater flexibility and offer the equivalent `Into`

src/libcore/str/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ impl StrExt for str {
17401740
let mut matcher = pat.into_searcher(self);
17411741
if let Some((a, b)) = matcher.next_reject() {
17421742
i = a;
1743-
j = b; // Rember earliest known match, correct it below if
1743+
j = b; // Remember earliest known match, correct it below if
17441744
// last match is different
17451745
}
17461746
if let Some((_, b)) = matcher.next_reject_back() {

src/librbml/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
//!
108108
//! - `Opaque` (`17`): An opaque, custom-format tag.
109109
//! Used to wrap ordinary custom tags or data in the auto-serialized context.
110-
//! Rustc typically uses this to encode type informations.
110+
//! Rustc typically uses this to encode type information.
111111
//!
112112
//! First 0x20 tags are reserved by RBML; custom tags start at 0x20.
113113

src/librustc/middle/pat_util.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ pub fn pat_contains_bindings(dm: &DefMap, pat: &hir::Pat) -> bool {
153153
}
154154

155155
/// Checks if the pattern contains any `ref` or `ref mut` bindings,
156-
/// and if yes wether its containing mutable ones or just immutables ones.
156+
/// and if yes whether its containing mutable ones or just immutables ones.
157157
pub fn pat_contains_ref_binding(dm: &RefCell<DefMap>, pat: &hir::Pat) -> Option<hir::Mutability> {
158158
let mut result = None;
159159
pat_bindings(dm, pat, |mode, _, _, _| {
@@ -172,7 +172,7 @@ pub fn pat_contains_ref_binding(dm: &RefCell<DefMap>, pat: &hir::Pat) -> Option<
172172
}
173173

174174
/// Checks if the patterns for this arm contain any `ref` or `ref mut`
175-
/// bindings, and if yes wether its containing mutable ones or just immutables ones.
175+
/// bindings, and if yes whether its containing mutable ones or just immutables ones.
176176
pub fn arm_contains_ref_binding(dm: &RefCell<DefMap>, arm: &hir::Arm) -> Option<hir::Mutability> {
177177
arm.pats.iter()
178178
.filter_map(|pat| pat_contains_ref_binding(dm, pat))

src/librustc/middle/ty/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2236,7 +2236,7 @@ impl<'tcx> ctxt<'tcx> {
22362236
/// Given the did of an ADT, return a reference to its definition.
22372237
pub fn lookup_adt_def(&self, did: DefId) -> AdtDef<'tcx> {
22382238
// when reverse-variance goes away, a transmute::<AdtDefMaster,AdtDef>
2239-
// woud be needed here.
2239+
// would be needed here.
22402240
self.lookup_adt_def_master(did)
22412241
}
22422242

0 commit comments

Comments
 (0)