Skip to content

Commit ca17412

Browse files
committed
Merge branch 'fiber-refactoring' into 'master'
fiber: refactor fiber and builder See merge request picodata/brod/tarantool-module!45
2 parents 2e5a56a + b01ce4d commit ca17412

File tree

7 files changed

+344
-373
lines changed

7 files changed

+344
-373
lines changed

tarantool/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ default = ["net_box"]
5151
net_box = ["lazy_static", "refpool"]
5252
raft_node = ["chrono", "ipnetwork", "net_box", "protobuf", "raft", "rand"]
5353
schema = []
54-
all = ["default", "raft_node", "schema"]
54+
defer = []
55+
all = ["default", "raft_node", "schema", "defer"]
5556

tarantool/src/ffi/tarantool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern "C" {
5656
/// - `host` host name, i.e. "tarantool.org"
5757
/// - `port` service name, i.e. "80" or "http"
5858
/// - `hints` hints, see getaddrinfo(3)
59-
/// - `res`[out] result, see getaddrinfo(3)
59+
/// - `res`(out) result, see getaddrinfo(3)
6060
/// - `timeout` timeout
6161
///
6262
/// Returns:

0 commit comments

Comments
 (0)