From c113cd6bf5c0462df340d5b10f0c8f890f560e94 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Wed, 25 Aug 2021 12:03:04 +0800
Subject: [PATCH] libfringe: bump

---
 artiq/firmware/runtime/Cargo.toml | 4 ++--
 artiq/firmware/runtime/sched.rs   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/artiq/firmware/runtime/Cargo.toml b/artiq/firmware/runtime/Cargo.toml
index ca624e3b6..a29acbb86 100644
--- a/artiq/firmware/runtime/Cargo.toml
+++ b/artiq/firmware/runtime/Cargo.toml
@@ -31,7 +31,7 @@ smoltcp = { version = "0.6.0", default-features = false, features = ["alloc", "e
 riscv = { version = "0.6.0", features = ["inline-asm"] }
 
 [dependencies.fringe]
-git = "https://github.com/m-labs/libfringe"
-rev = "b8a6d8f"
+git = "https://git.m-labs.hk/M-Labs/libfringe.git"
+rev = "9748bb"
 default-features = false
 features = ["alloc"]
diff --git a/artiq/firmware/runtime/sched.rs b/artiq/firmware/runtime/sched.rs
index a63ad3332..43dae0f55 100644
--- a/artiq/firmware/runtime/sched.rs
+++ b/artiq/firmware/runtime/sched.rs
@@ -50,7 +50,7 @@ enum WaitResult {
 
 #[derive(Debug)]
 struct Thread {
-    generator:   Generator<WaitResult, WaitRequest, OwnedStack>,
+    generator:   Generator<'static, WaitResult, WaitRequest, OwnedStack>,
     waiting_for: WaitRequest,
     interrupted: bool
 }
@@ -194,7 +194,7 @@ impl Scheduler {
 
 #[derive(Clone)]
 pub struct Io<'a> {
-    yielder: Option<&'a Yielder<WaitResult, WaitRequest, OwnedStack>>,
+    yielder: Option<&'a Yielder<WaitResult, WaitRequest>>,
     spawned: Urc<RefCell<Vec<ThreadHandle>>>,
     sockets: Urc<RefCell<SocketSet>>,
 }
@@ -207,7 +207,7 @@ impl<'a> Io<'a> {
         handle
     }
 
-    fn yielder(&self) -> &'a Yielder<WaitResult, WaitRequest, OwnedStack> {
+    fn yielder(&self) -> &'a Yielder<WaitResult, WaitRequest> {
         self.yielder.expect("cannot suspend the scheduler thread")
     }