mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-29 18:23:49 +00:00
update
This commit is contained in:
parent
c3681d62ee
commit
9a78c2b11d
@ -129,7 +129,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
|
||||
let mut prev_rest_span = None;
|
||||
|
||||
let mut iter = pats.iter();
|
||||
// Lower all the patterns until the first occurence of a sub-slice pattern.
|
||||
// Lower all the patterns until the first occurrence of a sub-slice pattern.
|
||||
for pat in iter.by_ref() {
|
||||
match pat.kind {
|
||||
// Found a sub-slice pattern `..`. Record, lower it to `_`, and stop here.
|
||||
|
@ -477,7 +477,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
||||
}
|
||||
|
||||
/// If one of the types is an uncalled function and calling it would yield the other type,
|
||||
/// suggest calling the function. Returns wether a suggestion was given.
|
||||
/// suggest calling the function. Returns whether a suggestion was given.
|
||||
fn add_type_neq_err_label(
|
||||
&self,
|
||||
err: &mut rustc_errors::DiagnosticBuilder<'_>,
|
||||
|
@ -19,7 +19,7 @@ pub fn errno() -> i32 {
|
||||
|
||||
pub fn error_string(errno: i32) -> String {
|
||||
if errno == RESULT_SUCCESS {
|
||||
"operation succesful".into()
|
||||
"operation successful".into()
|
||||
} else if ((Error::UserRangeStart as _)..=(Error::UserRangeEnd as _)).contains(&errno) {
|
||||
format!("user-specified error {:08x}", errno)
|
||||
} else {
|
||||
|
@ -10,7 +10,7 @@
|
||||
// However, we did not account for the expected type being different than the tuple pattern type.
|
||||
// This caused an issue when the tuple pattern type (`P<T>`) was generic.
|
||||
// Specifically, we tried deriving the 0th field's type using the `substs` of the expected type.
|
||||
// When attempting to substitute `T`, there was no such substitution, so "out of range" occured.
|
||||
// When attempting to substitute `T`, there was no such substitution, so "out of range" occurred.
|
||||
|
||||
struct U {} // 0 type parameters offered
|
||||
struct P<T>(T); // 1 type parameter wanted
|
||||
|
@ -2949,7 +2949,7 @@ impl<'test> TestCx<'test> {
|
||||
};
|
||||
if run_output_errors > 0 {
|
||||
self.fatal_proc_rec(
|
||||
&format!("{} errors occured comparing run output.", run_output_errors),
|
||||
&format!("{} errors occurred comparing run output.", run_output_errors),
|
||||
&proc_res,
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user