Skip to content

Commit b249028

Browse files
authored
Unrolled build for rust-lang#134957
Rollup merge of rust-lang#134957 - peicuiping:master, r=lqd chore: fix some typos
2 parents 41b5796 + 09541c2 commit b249028

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/rustdoc-ui/doctest/non-local-defs-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/// }
2222
/// ```
2323
///
24-
/// But this shoudln't produce a warning:
24+
/// But this shouldn't produce a warning:
2525
/// ```rust,no_run
2626
/// # extern crate pub_trait;
2727
/// # use pub_trait::Trait;

tests/ui/closures/2229_closure_analysis/issue-118144.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ fn func(func_arg: &mut V) {
66
|| {
77
// Declaring `x` separately instead of using
88
// a destructuring binding like `let V(x) = ...`
9-
// becaue only `V(x) = ...` triggers the ICE
9+
// because only `V(x) = ...` triggers the ICE
1010
let x;
1111
V(x) = func_arg; //~ ERROR: mismatched types
1212
func_arg.0 = 0;

tests/ui/coroutine/issue-53548.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// to process this `'r` region bound. In particular, to be WF, the
77
// region bound must meet the requirements of the trait, and hence we
88
// got `for<'r> { 'r: 'static }`. This would ICE because the `Binder`
9-
// constructor we were using was assering that no higher-ranked
9+
// constructor we were using was asserting that no higher-ranked
1010
// regions were involved (because the WF code is supposed to skip
1111
// those). The error (if debug-asserions were disabled) came because
1212
// we obviously cannot prove that `'r: 'static` for any region `'r`.

tests/ui/panics/default-backtrace-ice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// `__rust_{begin,end}_short_backtrace` markers, which only appear in full
1818
// backtraces. The rest of the backtrace is filtered out.
1919
//
20-
// Ignored on msvc becaue the `__rust_{begin,end}_short_backtrace` symbols
20+
// Ignored on msvc because the `__rust_{begin,end}_short_backtrace` symbols
2121
// aren't reliable.
2222

2323
fn main() { missing_ident; }

0 commit comments

Comments
 (0)