summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcomet <hjung524@gmail.com>2020-01-26 22:52:13 -0600
committercomet <hjung524@gmail.com>2020-01-26 22:52:13 -0600
commit9a78c2b11d50fc1ed60c92eec7cb59ae74516e89 (patch)
tree5550ab96ce8c15169c3e875722258b21e19b2850
parentAuto merge of #68122 - Centril:stabilize-transparent-enums, r=petrochenkov (diff)
downloadrust-9a78c2b11d50fc1ed60c92eec7cb59ae74516e89.tar.gz
rust-9a78c2b11d50fc1ed60c92eec7cb59ae74516e89.tar.bz2
rust-9a78c2b11d50fc1ed60c92eec7cb59ae74516e89.tar.xz
update
-rw-r--r--src/librustc_ast_lowering/pat.rs2
-rw-r--r--src/librustc_typeck/check/op.rs2
-rw-r--r--src/libstd/sys/sgx/os.rs2
-rw-r--r--src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs2
-rw-r--r--src/tools/compiletest/src/runtest.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_ast_lowering/pat.rs b/src/librustc_ast_lowering/pat.rs
index 6cf640a..4c3c4dd 100644
--- a/src/librustc_ast_lowering/pat.rs
+++ b/src/librustc_ast_lowering/pat.rs
@@ -129,7 +129,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
129 let mut prev_rest_span = None; 129 let mut prev_rest_span = None;
130 130
131 let mut iter = pats.iter(); 131 let mut iter = pats.iter();
132 // Lower all the patterns until the first occurence of a sub-slice pattern. 132 // Lower all the patterns until the first occurrence of a sub-slice pattern.
133 for pat in iter.by_ref() { 133 for pat in iter.by_ref() {
134 match pat.kind { 134 match pat.kind {
135 // Found a sub-slice pattern `..`. Record, lower it to `_`, and stop here. 135 // Found a sub-slice pattern `..`. Record, lower it to `_`, and stop here.
diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs
index 91e1731..1ab8f05 100644
--- a/src/librustc_typeck/check/op.rs
+++ b/src/librustc_typeck/check/op.rs
@@ -477,7 +477,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
477 } 477 }
478 478
479 /// If one of the types is an uncalled function and calling it would yield the other type, 479 /// If one of the types is an uncalled function and calling it would yield the other type,
480 /// suggest calling the function. Returns wether a suggestion was given. 480 /// suggest calling the function. Returns whether a suggestion was given.
481 fn add_type_neq_err_label( 481 fn add_type_neq_err_label(
482 &self, 482 &self,
483 err: &mut rustc_errors::DiagnosticBuilder<'_>, 483 err: &mut rustc_errors::DiagnosticBuilder<'_>,
diff --git a/src/libstd/sys/sgx/os.rs b/src/libstd/sys/sgx/os.rs
index 6ed7a2f..56fc84b 100644
--- a/src/libstd/sys/sgx/os.rs
+++ b/src/libstd/sys/sgx/os.rs
@@ -19,7 +19,7 @@ pub fn errno() -> i32 {
19 19
20pub fn error_string(errno: i32) -> String { 20pub fn error_string(errno: i32) -> String {
21 if errno == RESULT_SUCCESS { 21 if errno == RESULT_SUCCESS {
22 "operation succesful".into() 22 "operation successful".into()
23 } else if ((Error::UserRangeStart as _)..=(Error::UserRangeEnd as _)).contains(&errno) { 23 } else if ((Error::UserRangeStart as _)..=(Error::UserRangeEnd as _)).contains(&errno) {
24 format!("user-specified error {:08x}", errno) 24 format!("user-specified error {:08x}", errno)
25 } else { 25 } else {
diff --git a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs b/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
index 44bd645..a3023ee 100644
--- a/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
+++ b/src/test/ui/issues/issue-67037-pat-tup-scrut-ty-diff-less-fields.rs
@@ -10,7 +10,7 @@
10// However, we did not account for the expected type being different than the tuple pattern type. 10// However, we did not account for the expected type being different than the tuple pattern type.
11// This caused an issue when the tuple pattern type (`P<T>`) was generic. 11// This caused an issue when the tuple pattern type (`P<T>`) was generic.
12// Specifically, we tried deriving the 0th field's type using the `substs` of the expected type. 12// Specifically, we tried deriving the 0th field's type using the `substs` of the expected type.
13// When attempting to substitute `T`, there was no such substitution, so "out of range" occured. 13// When attempting to substitute `T`, there was no such substitution, so "out of range" occurred.
14 14
15struct U {} // 0 type parameters offered 15struct U {} // 0 type parameters offered
16struct P<T>(T); // 1 type parameter wanted 16struct P<T>(T); // 1 type parameter wanted
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index d1ee60d..be66c9a 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2949,7 +2949,7 @@ impl<'test> TestCx<'test> {
2949 }; 2949 };
2950 if run_output_errors > 0 { 2950 if run_output_errors > 0 {
2951 self.fatal_proc_rec( 2951 self.fatal_proc_rec(
2952 &format!("{} errors occured comparing run output.", run_output_errors), 2952 &format!("{} errors occurred comparing run output.", run_output_errors),
2953 &proc_res, 2953 &proc_res,
2954 ); 2954 );
2955 } 2955 }