Update to Rust 1.61

a-b-street · May 21, 2022 · b236c23 · b236c23
1 parent a5a9415
commit b236c23
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
 
       - uses: hecrj/setup-rust-action@v1
         with:
-          rust-version: 1.60.0
+          rust-version: 1.61.0
 
       - name: Cache build
         uses: actions/cache@v2

diff --git a/widgetry/src/app_state.rs b/widgetry/src/app_state.rs
@@ -33,7 +33,7 @@ pub(crate) struct App<A: SharedAppState> {
     pub(crate) shared_app_state: A,
 }
 
-impl<A: SharedAppState> App<A> {
+impl<A: 'static + SharedAppState> App<A> {
     pub(crate) fn event(&mut self, ctx: &mut EventCtx) {
         self.shared_app_state.before_event();
 

diff --git a/widgetry/src/runner.rs b/widgetry/src/runner.rs
@@ -29,7 +29,7 @@ pub(crate) struct State<A: SharedAppState> {
     focus_owned_by: Option<String>,
 }
 
-impl<A: SharedAppState> State<A> {
+impl<A: 'static + SharedAppState> State<A> {
     // The bool indicates if the input was actually used.
     fn event(&mut self, mut ev: Event, prerender: &Prerender) -> (Vec<UpdateType>, bool) {
         if let Event::MouseWheelScroll(dx, dy) = ev {

diff --git a/widgetry/src/tools/screenshot.rs b/widgetry/src/tools/screenshot.rs
@@ -4,7 +4,7 @@ use crate::runner::State;
 use crate::{Prerender, ScreenDims, SharedAppState};
 
 /// Take a screenshot of the entire canvas, tiling it based on the window's width and height.
-pub(crate) fn screenshot_everything<A: SharedAppState>(
+pub(crate) fn screenshot_everything<A: 'static + SharedAppState>(
     state: &mut State<A>,
     dir_path: &str,
     prerender: &Prerender,