Skip to content

Commit 5ccc76f

Browse files
committed
Rollup merge of #55870 - waywardmonkeys:typo-fixes, r=wesleywiser
Fix typos.
2 parents 910289c + a62af85 commit 5ccc76f

File tree

19 files changed

+22
-22
lines changed

19 files changed

+22
-22
lines changed

src/bootstrap/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ impl Step for StdLink {
203203

204204
/// Link all libstd rlibs/dylibs into the sysroot location.
205205
///
206-
/// Links those artifacts generated by `compiler` to a the `stage` compiler's
206+
/// Links those artifacts generated by `compiler` to the `stage` compiler's
207207
/// sysroot for the specified `host` and `target`.
208208
///
209209
/// Note that this assumes that `compiler` has already generated the libstd

src/etc/lldb_batchmode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# containing LLDB commands (one command per line), this script will execute the commands one after
1313
# the other.
1414
# LLDB also has the -s and -S commandline options which also execute a list of commands from a text
15-
# file. However, this command are execute `immediately`: a the command of a `run` or `continue`
15+
# file. However, this command are execute `immediately`: the command of a `run` or `continue`
1616
# command will be executed immediately after the `run` or `continue`, without waiting for the next
1717
# breakpoint to be hit. This a command sequence like the following will not yield reliable results:
1818
#

src/libcore/str/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@ mod traits {
18961896
#[inline]
18971897
fn index_mut(self, slice: &mut str) -> &mut Self::Output {
18981898
// is_char_boundary checks that the index is in [0, .len()]
1899-
// canot reuse `get` as above, because of NLL trouble
1899+
// cannot reuse `get` as above, because of NLL trouble
19001900
if self.start <= self.end &&
19011901
slice.is_char_boundary(self.start) &&
19021902
slice.is_char_boundary(self.end) {

src/librustc/infer/outlives/obligations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
132132
///
133133
/// See the `region_obligations` field of `InferCtxt` for some
134134
/// comments about how this function fits into the overall expected
135-
/// flow of the the inferencer. The key point is that it is
135+
/// flow of the inferencer. The key point is that it is
136136
/// invoked after all type-inference variables have been bound --
137137
/// towards the end of regionck. This also ensures that the
138138
/// region-bound-pairs are available (see comments above regarding

src/librustc/mir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2611,7 +2611,7 @@ pub fn fmt_const_val(f: &mut impl Write, const_val: &ty::Const<'_>) -> fmt::Resu
26112611
_ => {}
26122612
}
26132613
}
2614-
// print function definitons
2614+
// print function definitions
26152615
if let FnDef(did, _) = ty.sty {
26162616
return write!(f, "{}", item_path_str(did));
26172617
}

src/librustc/mir/traversal.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'a, 'tcx> Postorder<'a, 'tcx> {
142142
//
143143
// It does the actual traversal of the graph, while the `next` method on the iterator
144144
// just pops off of the stack. `visit_stack` is a stack containing pairs of nodes and
145-
// iterators over the sucessors of those nodes. Each iteration attempts to get the next
145+
// iterators over the successors of those nodes. Each iteration attempts to get the next
146146
// node from the top of the stack, then pushes that node and an iterator over the
147147
// successors to the top of the stack. This loop only grows `visit_stack`, stopping when
148148
// we reach a child that has no children that we haven't already visited.
@@ -163,7 +163,7 @@ impl<'a, 'tcx> Postorder<'a, 'tcx> {
163163
// The state of the stack starts out with just the root node (`A` in this case);
164164
// [(A, [B, C])]
165165
//
166-
// When the first call to `traverse_sucessor` happens, the following happens:
166+
// When the first call to `traverse_successor` happens, the following happens:
167167
//
168168
// [(B, [D]), // `B` taken from the successors of `A`, pushed to the
169169
// // top of the stack along with the successors of `B`

src/librustc/ty/query/plumbing.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub(super) struct JobOwner<'a, 'tcx: 'a, Q: QueryDescription<'tcx> + 'a> {
100100
}
101101

102102
impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> {
103-
/// Either gets a JobOwner corresponding the the query, allowing us to
103+
/// Either gets a JobOwner corresponding the query, allowing us to
104104
/// start executing the query, or it returns with the result of the query.
105105
/// If the query is executing elsewhere, this will wait for it.
106106
/// If the query panicked, this will silently panic.
@@ -314,7 +314,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
314314
/// Try to read a node index for the node dep_node.
315315
/// A node will have an index, when it's already been marked green, or when we can mark it
316316
/// green. This function will mark the current task as a reader of the specified node, when
317-
/// the a node index can be found for that node.
317+
/// a node index can be found for that node.
318318
pub(super) fn try_mark_green_and_read(self, dep_node: &DepNode) -> Option<DepNodeIndex> {
319319
match self.dep_graph.node_color(dep_node) {
320320
Some(DepNodeColor::Green(dep_node_index)) => {

src/librustc_apfloat/ieee.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ impl<S: Semantics> Float for IeeeFloat<S> {
895895
}
896896

897897
// The intermediate result of the multiplication has "2 * S::PRECISION"
898-
// signicant bit; adjust the addend to be consistent with mul result.
898+
// significant bit; adjust the addend to be consistent with mul result.
899899
let mut ext_addend_sig = [addend.sig[0], 0];
900900

901901
// Extend the addend significand to ext_precision - 1. This guarantees
@@ -920,7 +920,7 @@ impl<S: Semantics> Float for IeeeFloat<S> {
920920

921921
// Convert the result having "2 * S::PRECISION" significant-bits back to the one
922922
// having "S::PRECISION" significant-bits. First, move the radix point from
923-
// poision "2*S::PRECISION - 1" to "S::PRECISION - 1". The exponent need to be
923+
// position "2*S::PRECISION - 1" to "S::PRECISION - 1". The exponent need to be
924924
// adjusted by "2*S::PRECISION - 1" - "S::PRECISION - 1" = "S::PRECISION".
925925
self.exp -= S::PRECISION as ExpInt + 1;
926926

src/librustc_codegen_llvm/llvm_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ const WASM_WHITELIST: &[(&str, Option<&str>)] = &[
184184
];
185185

186186
/// When rustdoc is running, provide a list of all known features so that all their respective
187-
/// primtives may be documented.
187+
/// primitives may be documented.
188188
///
189189
/// IMPORTANT: If you're adding another whitelist to the above lists, make sure to add it to this
190190
/// iterator!

src/librustc_codegen_utils/linker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ impl<'a> Linker for MsvcLinker<'a> {
613613
// from the CodeView line tables in the object files.
614614
self.cmd.arg("/DEBUG");
615615

616-
// This will cause the Microsoft linker to embed .natvis info into the the PDB file
616+
// This will cause the Microsoft linker to embed .natvis info into the PDB file
617617
let sysroot = self.sess.sysroot();
618618
let natvis_dir_path = sysroot.join("lib\\rustlib\\etc");
619619
if let Ok(natvis_dir) = fs::read_dir(&natvis_dir_path) {

0 commit comments

Comments
 (0)