This commit is contained in:
comet 2020-01-26 22:52:13 -06:00
parent c3681d62ee
commit 9a78c2b11d
No known key found for this signature in database
GPG Key ID: D00B29ECBC9F2A76
5 changed files with 5 additions and 5 deletions

View File

@ -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.

View File

@ -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<'_>,

View File

@ -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 {

View File

@ -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

View File

@ -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,
);
}