Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Decommission async-support #170

Merged
merged 8 commits into from
Apr 6, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix static errors after toolchain update
Woyten committed Apr 6, 2020
commit a971a48190b729393359f6e2bf47ad431099e02e
2 changes: 1 addition & 1 deletion async-support/src/lib.rs
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ pub mod executor {
let pinned_generator =
unsafe { self.map_unchecked_mut(|future| &mut future.generator) };

match pinned_generator.resume() {
match pinned_generator.resume(()) {
GeneratorState::Yielded(()) => Poll::Pending,
GeneratorState::Complete(out) => Poll::Ready(out),
}
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -10,5 +10,5 @@ custom_panic_handler = []
custom_alloc_error_handler = []

[dependencies]
linked_list_allocator = { optional = true, version = "=0.6.5", default-features = false }
linked_list_allocator = { optional = true, version = "=0.8.1", default-features = false }
libtock_codegen = { path = "../codegen" }
2 changes: 1 addition & 1 deletion core/src/entry_point/start_item_arm.rs
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ pub unsafe extern "C" fn _start(
bl rust_start"
: // No output operands
: "{r0}"(app_start), "{r1}"(mem_start), "{r3}"(app_heap_break) // Input operands
: "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8", "r12",
: "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r8", "r12",
"cc", "memory" // Clobbers
: "volatile" // Options
);