Skip to content

Commit af140ec

Browse files
Rollup merge of #48275 - matthiaskrgr:codespell, r=kennytm,varkor
fix more typos found by codespell.
2 parents b7791b0 + 4452446 commit af140ec

File tree

69 files changed

+89
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+89
-89
lines changed

RELEASES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Libraries
2929
- [Copied `AsciiExt` methods onto `char`][46077]
3030
- [Remove `T: Sized` requirement on `ptr::is_null()`][46094]
3131
- [impl `From<RecvError>` for `{TryRecvError, RecvTimeoutError}`][45506]
32-
- [Optimised `f32::{min, max}` to generate more efficent x86 assembly][47080]
32+
- [Optimised `f32::{min, max}` to generate more efficient x86 assembly][47080]
3333
- [`[u8]::contains` now uses memchr which provides a 3x speed improvement][46713]
3434

3535
Stabilized APIs

config.toml.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@
151151
# default.
152152
#extended = false
153153

154-
# Installs choosen set of extended tools if enables. By default builds all.
155-
# If choosen tool failed to build the installation fails.
154+
# Installs chosen set of extended tools if enables. By default builds all.
155+
# If chosen tool failed to build the installation fails.
156156
#tools = ["cargo", "rls", "rustfmt", "analysis", "src"]
157157

158158
# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose

src/bootstrap/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ impl Step for Compiletest {
935935
}
936936
}
937937
if suite == "run-make" && !build.config.llvm_enabled {
938-
println!("Ignoring run-make test suite as they generally dont work without LLVM");
938+
println!("Ignoring run-make test suite as they generally don't work without LLVM");
939939
return;
940940
}
941941

src/librustc/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1891,7 +1891,7 @@ is a function pointer, which is not zero-sized.
18911891
This pattern should be rewritten. There are a few possible ways to do this:
18921892
18931893
- change the original fn declaration to match the expected signature,
1894-
and do the cast in the fn body (the prefered option)
1894+
and do the cast in the fn body (the preferred option)
18951895
- cast the fn item fo a fn pointer before calling transmute, as shown here:
18961896
18971897
```

src/librustc/hir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ impl Generics {
543543
}
544544

545545
/// Synthetic Type Parameters are converted to an other form during lowering, this allows
546-
/// to track the original form they had. Usefull for error messages.
546+
/// to track the original form they had. Useful for error messages.
547547
#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
548548
pub enum SyntheticTyParamKind {
549549
ImplTrait

src/librustc/infer/error_reporting/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
734734
}
735735
}
736736

737-
// When finding T != &T, hightlight only the borrow
737+
// When finding T != &T, highlight only the borrow
738738
(&ty::TyRef(r1, ref tnm1), _) if equals(&tnm1.ty, &t2) => {
739739
let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
740740
push_ty_ref(&r1, tnm1, &mut values.0);
@@ -946,7 +946,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
946946
let type_param = generics.type_param(param, self.tcx);
947947
let hir = &self.tcx.hir;
948948
hir.as_local_node_id(type_param.def_id).map(|id| {
949-
// Get the `hir::TyParam` to verify wether it already has any bounds.
949+
// Get the `hir::TyParam` to verify whether it already has any bounds.
950950
// We do this to avoid suggesting code that ends up as `T: 'a'b`,
951951
// instead we suggest `T: 'a + 'b` in that case.
952952
let has_lifetimes = if let hir_map::NodeTyParam(ref p) = hir.get(id) {

src/librustc/infer/outlives/obligations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
106106
/// done (or else an assert will fire).
107107
///
108108
/// See the `region_obligations` field of `InferCtxt` for some
109-
/// comments about how this funtion fits into the overall expected
109+
/// comments about how this function fits into the overall expected
110110
/// flow of the the inferencer. The key point is that it is
111111
/// invoked after all type-inference variables have been bound --
112112
/// towards the end of regionck. This also ensures that the

src/librustc/infer/region_constraints/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The constraints are always of one of three possible forms:
1919
a subregion of Rj
2020
- `ConstrainRegSubVar(R, Ri)` states that the concrete region R (which
2121
must not be a variable) must be a subregion of the variable Ri
22-
- `ConstrainVarSubReg(Ri, R)` states the variable Ri shoudl be less
22+
- `ConstrainVarSubReg(Ri, R)` states the variable Ri should be less
2323
than the concrete region R. This is kind of deprecated and ought to
2424
be replaced with a verify (they essentially play the same role).
2525

src/librustc/middle/region.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ fn resolve_block<'a, 'tcx>(visitor: &mut RegionResolutionVisitor<'a, 'tcx>, blk:
886886
//
887887
// Each of the statements within the block is a terminating
888888
// scope, and thus a temporary (e.g. the result of calling
889-
// `bar()` in the initalizer expression for `let inner = ...;`)
889+
// `bar()` in the initializer expression for `let inner = ...;`)
890890
// will be cleaned up immediately after its corresponding
891891
// statement (i.e. `let inner = ...;`) executes.
892892
//

src/librustc/mir/interpret/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub struct GlobalId<'tcx> {
5656
////////////////////////////////////////////////////////////////////////////////
5757

5858
pub trait PointerArithmetic: layout::HasDataLayout {
59-
// These are not supposed to be overriden.
59+
// These are not supposed to be overridden.
6060

6161
//// Trunace the given value to the pointer size; also return whether there was an overflow
6262
fn truncate_to_ptr(self, val: u128) -> (u64, bool) {

0 commit comments

Comments
 (0)