Skip to content

Commit 2967e0c

Browse files
committed
rebase and new fixes
1 parent ef48983 commit 2967e0c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
24562456
}
24572457

24582458
if !mismatched_params.is_empty() {
2459-
// For each mismatched paramter, create a two-way link to each matched parameter
2459+
// For each mismatched parameter, create a two-way link to each matched parameter
24602460
// of the same type.
24612461
let mut dependants = IndexVec::<ExpectedIdx, _>::from_fn_n(
24622462
|_| SmallVec::<[u32; 4]>::new(),
@@ -2499,7 +2499,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
24992499
spans.push_span_label(param.param.span(), "");
25002500
}
25012501
}
2502-
// Highligh each parameter being depended on for a generic type.
2502+
// Highlight each parameter being depended on for a generic type.
25032503
for ((&(_, param), deps), &(_, expected_ty)) in
25042504
params_with_generics.iter().zip(&dependants).zip(formal_and_expected_inputs)
25052505
{

library/core/src/intrinsics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3270,7 +3270,7 @@ pub const unsafe fn const_deallocate(_ptr: *mut u8, _size: usize, _align: usize)
32703270
/// Returns whether we should perform contract-checking at runtime.
32713271
///
32723272
/// This is meant to be similar to the ub_checks intrinsic, in terms
3273-
/// of not prematurely commiting at compile-time to whether contract
3273+
/// of not prematurely committing at compile-time to whether contract
32743274
/// checking is turned on, so that we can specify contracts in libstd
32753275
/// and let an end user opt into turning them on.
32763276
#[rustc_const_unstable(feature = "contracts_internals", issue = "128044" /* compiler-team#759 */)]

src/librustdoc/doctest/extracted.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl ExtractedDocTests {
5252
Some(&opts.crate_name),
5353
);
5454
self.doctests.push(ExtractedDocTest {
55-
file: filename.prefer_remapped_unconditionaly().to_string(),
55+
file: filename.prefer_remapped_unconditionally().to_string(),
5656
line,
5757
doctest_attributes: langstr.into(),
5858
doctest_code: if size != 0 { Some(full_test_code) } else { None },

0 commit comments

Comments
 (0)