Skip to content

Commit 2e5a56a

Browse files
committed
Merge branch 'feature/hlua' into 'master'
Integrate hlua See merge request picodata/brod/tarantool-module!46
2 parents ca5a114 + 66c85a1 commit 2e5a56a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+7501
-152
lines changed

Cargo.toml

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,7 @@
1-
[package]
2-
name = "tarantool"
3-
description = "Tarantool rust bindings"
4-
version = "0.4.2"
5-
authors = [
6-
"Dmitriy Koltsov <dkoltsov@picodata.io>",
7-
"Anton Melnikov <volt0@picodata.io>"
8-
]
9-
edition = "2018"
10-
license = "BSD-2-Clause"
11-
readme = "README.md"
12-
documentation = "https://docs.rs/tarantool/"
13-
repository = "https://github.com/picodata/tarantool-module"
14-
keywords = ["ffi", "database", "tarantool"]
15-
categories = ["database"]
16-
17-
[dependencies]
18-
base64 = "0.13"
19-
bitflags = "1.2"
20-
byteorder = "1.3"
21-
chrono = { version = "0.4.19", optional = true }
22-
derivative = "2.1"
23-
failure = "0.1.8"
24-
ipnetwork = { version = "0.18.0", optional = true }
25-
lazy_static = { version = "1.4", optional = true }
26-
libc = "0.2"
27-
log = "0.4"
28-
num-traits = "0.2"
29-
num-derive = "0.3"
30-
protobuf = { version = "2", optional = true }
31-
raft = { version = "0.6.0", optional = true }
32-
refpool = { version = "0.4.3", optional = true }
33-
rand = { version = "0.8.3", optional = true }
34-
rmp = "0.8"
35-
rmp-serde = "0.14"
36-
serde = { version = "1.0", features = ["derive"] }
37-
serde_json = "1.0"
38-
sha-1 = "0.9"
39-
va_list = "0.1.3"
40-
41-
[features]
42-
default = ["net_box"]
43-
net_box = ["lazy_static", "refpool"]
44-
raft_node = ["chrono", "ipnetwork", "net_box", "protobuf", "raft", "rand"]
45-
schema = []
46-
all = ["default", "raft_node", "schema"]
47-
481
[workspace]
2+
exclude = [ "hlua" ]
493
members = [
4+
"tarantool",
505
"tests",
516
"examples/easy",
527
"examples/harder",
@@ -55,3 +10,4 @@ members = [
5510
"examples/write",
5611
"examples/cluster_node"
5712
]
13+

examples/cluster_node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "BSD-2-Clause"
1212
lazy_static = "1.4.0"
1313

1414
[dependencies.tarantool]
15-
path = "../.."
15+
path = "../../tarantool"
1616
features = ["raft_node"]
1717

1818
[lib]

examples/easy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2018"
99
license = "BSD-2-Clause"
1010

1111
[dependencies.tarantool]
12-
path = "../.."
12+
path = "../../tarantool"
1313

1414
[lib]
1515
crate-type = ["cdylib"]

examples/harder/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "BSD-2-Clause"
1212
serde = "1.0"
1313

1414
[dependencies.tarantool]
15-
path = "../.."
15+
path = "../../tarantool"
1616

1717
[lib]
1818
crate-type = ["cdylib"]

examples/hardest/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "BSD-2-Clause"
1212
serde = "1.0"
1313

1414
[dependencies.tarantool]
15-
path = "../.."
15+
path = "../../tarantool"
1616

1717
[lib]
1818
crate-type = ["cdylib"]

examples/read/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "BSD-2-Clause"
1212
serde = "1.0"
1313

1414
[dependencies.tarantool]
15-
path = "../.."
15+
path = "../../tarantool"
1616

1717
[lib]
1818
crate-type = ["cdylib"]

examples/write/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2018"
99
license = "BSD-2-Clause"
1010

1111
[dependencies.tarantool]
12-
path = "../.."
12+
path = "../../tarantool"
1313

1414
[lib]
1515
crate-type = ["cdylib"]

hlua/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
members = [
3+
"hlua",
4+
"ffi",
5+
]

hlua/LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2015 Pierre Krieger
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

0 commit comments

Comments
 (0)