mirror of https://github.com/m-labs/artiq.git
libfringe: bump
This commit is contained in:
parent
251cd4dcc6
commit
c113cd6bf5
|
@ -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"]
|
||||
|
|
|
@ -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")
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue