diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-10-28 01:21:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 01:21:37 +0100 |
| commit | 3349b6847f8b396a976b86e1b5c211a6b3bf3177 (patch) | |
| tree | d89f95d9b351b3016f451d30ec39c70b7ef41dae | |
| parent | 14b4ed20c72194444fdb4df3ecda769f354be820 (diff) | |
| parent | b01c74b73ce13a3b71985926267d909e1fd40818 (diff) | |
| download | rust-3349b6847f8b396a976b86e1b5c211a6b3bf3177.tar.gz rust-3349b6847f8b396a976b86e1b5c211a6b3bf3177.zip | |
Rollup merge of #78447 - bugadani:typo, r=matthewjasper
Fix typo in comment I hope I got all the typos in that word. :)
| -rw-r--r-- | compiler/rustc_arena/src/lib.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/vec_graph/mod.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/compiler/rustc_arena/src/lib.rs b/compiler/rustc_arena/src/lib.rs index 1a85a46ed74..a8522547666 100644 --- a/compiler/rustc_arena/src/lib.rs +++ b/compiler/rustc_arena/src/lib.rs @@ -533,7 +533,7 @@ impl DropArena { ptr::write(mem, object); let result = &mut *mem; // Record the destructor after doing the allocation as that may panic - // and would cause `object`'s destuctor to run twice if it was recorded before + // and would cause `object`'s destructor to run twice if it was recorded before self.destructors .borrow_mut() .push(DropType { drop_fn: drop_for_type::<T>, obj: result as *mut T as *mut u8 }); @@ -560,7 +560,7 @@ impl DropArena { mem::forget(vec.drain(..)); // Record the destructors after doing the allocation as that may panic - // and would cause `object`'s destuctor to run twice if it was recorded before + // and would cause `object`'s destructor to run twice if it was recorded before for i in 0..len { destructors.push(DropType { drop_fn: drop_for_type::<T>, diff --git a/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs index 064467174ca..4ed88878418 100644 --- a/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs +++ b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs @@ -29,7 +29,7 @@ impl<N: Idx> VecGraph<N> { // Create the *edge starts* array. We are iterating over over // the (sorted) edge pairs. We maintain the invariant that the - // length of the `node_starts` arary is enough to store the + // length of the `node_starts` array is enough to store the // current source node -- so when we see that the source node // for an edge is greater than the current length, we grow the // edge-starts array by just enough. diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index d036c078049..29c686e5d08 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -738,14 +738,14 @@ impl<D: Decoder> Decodable<D> for Span { } /// Calls the provided closure, using the provided `SourceMap` to format -/// any spans that are debug-printed during the closure'e exectuino. +/// any spans that are debug-printed during the closure's execution. /// /// Normally, the global `TyCtxt` is used to retrieve the `SourceMap` /// (see `rustc_interface::callbacks::span_debug1). However, some parts /// of the compiler (e.g. `rustc_parse`) may debug-print `Span`s before /// a `TyCtxt` is available. In this case, we fall back to /// the `SourceMap` provided to this function. If that is not available, -/// we fall back to printing the raw `Span` field values +/// we fall back to printing the raw `Span` field values. pub fn with_source_map<T, F: FnOnce() -> T>(source_map: Lrc<SourceMap>, f: F) -> T { SESSION_GLOBALS.with(|session_globals| { *session_globals.source_map.borrow_mut() = Some(source_map); |
