Merge branch 'main' into body

oxidecomputer · Apr 7, 2022 · 4fed558 · 4fed558
2 parents 894c60b + d19bccd
commit 4fed558
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/dropshot/tests/fail/bad_endpoint10.stderr b/dropshot/tests/fail/bad_endpoint10.stderr
@@ -2,7 +2,10 @@ error[E0271]: type mismatch resolving `<String as TypeEq>::This == HttpError`
   --> tests/fail/bad_endpoint10.rs:16:6
    |
 16 | ) -> Result<HttpResponseOk<()>, String> {
-   |      ^^^^^^ expected struct `HttpError`, found struct `String`
+   |      ^^^^^^
+   |      |
+   |      expected this to be `HttpError`
+   |      type mismatch resolving `<String as TypeEq>::This == HttpError`
    |
 note: required by a bound in `validate_result_error_type`
   --> tests/fail/bad_endpoint10.rs:16:6

diff --git a/dropshot/tests/fail/bad_endpoint15.stderr b/dropshot/tests/fail/bad_endpoint15.stderr
@@ -26,12 +26,12 @@ error: future cannot be sent between threads safely
    |
    = help: within `impl Future<Output = Result<HttpResponseOk<i32>, HttpError>>`, the trait `Send` is not implemented for `Rc<i32>`
 note: future is not `Send` as this value is used across an await
-  --> tests/fail/bad_endpoint15.rs:21:5
+  --> tests/fail/bad_endpoint15.rs:21:49
    |
 20 |     let non_send_type = Rc::new(0);
    |         ------------- has type `Rc<i32>` which is not `Send`
 21 |     tokio::time::sleep(Duration::from_millis(1)).await;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ await occurs here, with `non_send_type` maybe used later
+   |                                                 ^^^^^^ await occurs here, with `non_send_type` maybe used later
 22 |     Ok(HttpResponseOk(*non_send_type))
 23 | }
    | - `non_send_type` is later dropped here

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -4,5 +4,5 @@
 # The intent is to keep this updated as new stable versions are relased.
 
 [toolchain]
-channel = "1.58.1"
+channel = "1.60.0"
 profile = "default"