Skip to content

Commit c3494a1

Browse files
committed
rebase and fix
1 parent 3a72b86 commit c3494a1

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

compiler/rustc_ast_lowering/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
876876
let ret = self.arena.alloc_from_iter(lowered_attrs);
877877

878878
// this is possible if an item contained syntactical attribute,
879-
// but none of them parse succesfully or all of them were ignored
879+
// but none of them parse successfully or all of them were ignored
880880
// for not being built-in attributes at all. They could be remaining
881881
// unexpanded attributes used as markers in proc-macro derives for example.
882882
// This will have emitted some diagnostics for the misparse, but will then

compiler/rustc_attr_parsing/src/attributes/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub(crate) trait AttributeParser: Default + 'static {
7474
pub(crate) trait SingleAttributeParser: 'static {
7575
const PATH: &'static [rustc_span::Symbol];
7676

77-
/// Caled when a duplicate attribute is found.
77+
/// Called when a duplicate attribute is found.
7878
///
7979
/// `first_span` is the span of the first occurrence of this attribute.
8080
// FIXME(jdonszelmann): default error

compiler/rustc_codegen_ssa/src/target_features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ pub(crate) fn provide(providers: &mut Providers) {
171171
// The stability in the entry is at least as good as the new one, just keep it.
172172
}
173173
_ => {
174-
// Overwrite stabilite.
174+
// Overwrite stability.
175175
occupied_entry.insert(stability);
176176
}
177177
}

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
126126
let mut deferred_repeat_expr_checks = self.deferred_repeat_expr_checks.borrow_mut();
127127
debug!("FnCtxt::check_repeat_exprs: {} deferred checks", deferred_repeat_expr_checks.len());
128128
for (element, element_ty, count) in deferred_repeat_expr_checks.drain(..) {
129-
// We want to emit an error if the const is not structurally resolveable as otherwise
129+
// We want to emit an error if the const is not structurally resolvable as otherwise
130130
// we can find up conservatively proving `Copy` which may infer the repeat expr count
131131
// to something that never required `Copy` in the first place.
132132
let count =

compiler/rustc_macros/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ decl_derive! {
180180
[PrintAttribute] =>
181181
/// Derives `PrintAttribute` for `AttributeKind`.
182182
/// This macro is pretty specific to `rustc_attr_data_structures` and likely not that useful in
183-
/// other places. It's deriving something close to `Debug` without printing some extraenous
183+
/// other places. It's deriving something close to `Debug` without printing some extraneous
184184
/// things like spans.
185185
print_attribute::print_attribute
186186
}

compiler/rustc_middle/src/ty/significant_drop_order.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn true_significant_drop_ty<'tcx>(
6868
}
6969
}
7070

71-
/// Returns the list of types with a "potentially sigificant" that may be dropped
71+
/// Returns the list of types with a "potentially significant" that may be dropped
7272
/// by dropping a value of type `ty`.
7373
#[instrument(level = "trace", skip(tcx, typing_env))]
7474
pub fn extract_component_raw<'tcx>(

compiler/rustc_type_ir/src/search_graph/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ pub struct SearchGraph<D: Delegate<Cx = X>, X: Cx = <D as Delegate>::Cx> {
442442
///
443443
/// `nested_goals` are only used when checking whether global cache entries
444444
/// are applicable. This only cares about whether a goal is actually accessed.
445-
/// Given that the usage of the provisional cache is fully determinstic, we
445+
/// Given that the usage of the provisional cache is fully deterministic, we
446446
/// don't need to track the nested goals used while computing a provisional
447447
/// cache entry.
448448
enum UpdateParentGoalCtxt<'a, X: Cx> {

src/librustdoc/html/render/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,7 @@ fn render_impl(
19271927
// 3. Functions
19281928
//
19291929
// This order is because you can have associated constants used in associated types (like array
1930-
// length), and both in associcated functions. So with this order, when reading from top to
1930+
// length), and both in associated functions. So with this order, when reading from top to
19311931
// bottom, you should see items definitions before they're actually used most of the time.
19321932
let mut assoc_types = Vec::new();
19331933
let mut methods = Vec::new();

0 commit comments

Comments
 (0)