Skip to content

Commit fedde12

Browse files
committed
Updatet to the last Rust.
Version of rustc: rustc 0.11-pre (2c22ae4 2014-04-19 04:26:28 -0700) The last two examples fail to link because of rust-lang/rust#13625.
1 parent d48aa26 commit fedde12

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ examples:
2424
$(build_cmd) ./examples/recording.rs
2525
$(build_cmd) ./examples/cube.rs
2626
$(build_cmd) ./examples/camera.rs
27-
$(build_cmd) ./examples/window.rs
28-
$(build_cmd) ./examples/lines.rs
2927
$(build_cmd) ./examples/text.rs
3028
$(build_cmd) ./examples/texturing.rs
3129
$(build_cmd) ./examples/post_processing.rs
@@ -42,6 +40,8 @@ examples:
4240
$(build_cmd) ./examples/obj.rs
4341
$(build_cmd) ./examples/relativity.rs
4442
$(build_cmd) ./examples/procedural.rs
43+
$(build_cmd) ./examples/lines.rs
44+
$(build_cmd) ./examples/window.rs
4545

4646
doc:
4747
mkdir -p $(kiss3d_doc_path)

src/procedural/mesh_descr.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::slice;
21
use collections::HashMap;
32
use nalgebra::na::{Iterable, Translate, Rotate, Transform, Vec3, Vec2};
43

@@ -54,9 +53,7 @@ impl<N> MeshDescr<N> {
5453
// generate trivial indices
5554
let idx = indices.unwrap_or_else(||
5655
UnifiedIndexBuffer(
57-
Vec::from_slice(
58-
slice::from_fn(coords.len() / 3, |i| Vec3::new(i as u32 * 3, i as u32 * 3 + 1, i as u32 * 3 + 2))
59-
)
56+
Vec::from_fn(coords.len() / 3, |i| Vec3::new(i as u32 * 3, i as u32 * 3 + 1, i as u32 * 3 + 2))
6057
)
6158
);
6259

0 commit comments

Comments
 (0)