Skip to content

Commit 2f618a6

Browse files
khvzaksdleffler
authored andcommitted
Update documentation references
Using rustdoc links (see RFC rust-lang/rfcs#1946)
1 parent e99c0e0 commit 2f618a6

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ macros = ["hv-lua-derive/macros"]
3434
default = ["luajit", "macros", "hv-ecs", "send", "serialize"]
3535

3636
[dependencies]
37-
hv-lua-derive = { version = "=0.6.0", optional = true, path = "../hv-lua-derive" }
37+
hv-lua-derive = { version = "=0.6.0", optional = true, path = "../hv-dev/hv/crates/hv-lua-derive" }
3838
bstr = { version = "0.2", features = ["std"], default_features = false }
3939
once_cell = { version = "1.0" }
4040
num-traits = { version = "0.2.14" }
@@ -43,16 +43,16 @@ futures-task = { version = "0.3.5", optional = true }
4343
futures-util = { version = "0.3.5", optional = true }
4444
serde = { version = "1.0", optional = true }
4545
erased-serde = { version = "0.3", optional = true }
46-
hv-ecs = { version = "0.1.0", path = "../hv-ecs", optional = true }
47-
hv-sync = { version = "0.1.0", path = "../hv-sync" }
48-
hv-alchemy = { version = "0.1.0", path = "../hv-alchemy" }
49-
hv-math = { version = "0.1.0", path = "../hv-math" }
46+
hv-ecs = { version = "0.1.0", optional = true }
47+
hv-sync = { version = "0.1.0", path = "../hv-dev/hv/crates/hv-sync" }
48+
hv-alchemy = { version = "0.1.0" }
49+
hv-math = { version = "0.1.0", path = "../hv-dev/hv/crates/hv-math" }
5050
static_assertions = "1.1.0"
5151

5252
# External integrations.
5353
nalgebra = { version = "0.29.0", optional = true }
5454
parry3d = { version = "0.7.1", optional = true }
55-
hv-guarded-borrow = { version = "0.1.1", path = "../hv-guarded-borrow" }
55+
hv-guarded-borrow = { version = "0.1.1" }
5656

5757
[build-dependencies]
5858
cc = { version = "1.0" }
@@ -71,7 +71,7 @@ tokio = { version = "1.0", features = ["full"] }
7171
futures-timer = "3.0"
7272
serde_json = "1.0"
7373
maplit = "1.0"
74-
hv = { path = "../..", package = "heavy" }
74+
hv = { path = "../hv-dev/hv", package = "heavy" }
7575

7676
[[bench]]
7777
name = "benchmark"

src/table.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,11 @@ where
705705
/// This struct is created by the [`Table::sequence_values`] method.
706706
///
707707
/// [`Table::sequence_values`]: crate::Table::sequence_values
708+
<<<<<<< HEAD
708709
pub struct TableSequenceIter<'lua, V> {
710+
=======
711+
pub struct TableSequence<'lua, V> {
712+
>>>>>>> ed48b11 (Update documentation references)
709713
table: LuaRef<'lua>,
710714
index: Option<Integer>,
711715
len: Option<Integer>,

0 commit comments

Comments
 (0)