Skip to content

Commit 2ce6bd9

Browse files
committed
Merge pull request #184 from toqueteos/latest-rust
Fixes #181 build errors
2 parents 0250c33 + 39ba840 commit 2ce6bd9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#![feature(box_syntax)]
22
#![feature(plugin)]
33

4+
#![feature(collections, core, io, os, path, rustc_private, std_misc)]
5+
46
#[plugin]
57
#[no_link]
68

src/minecraft/block_state.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use std::num::UnsignedInt;
99
use array::*;
1010
use chunk::{BiomeId, BlockState, Chunk};
1111
use cube;
12-
use device::draw::CommandBuffer;
1312
use gfx::Device;
1413
use minecraft::biome::Biomes;
1514
use minecraft::data::BLOCK_STATES;
@@ -28,14 +27,14 @@ pub struct BlockStates {
2827
texture: Texture
2928
}
3029

31-
#[derive(PartialEq, Eq, Clone)]
30+
#[derive(PartialEq, Eq, Clone, Copy)]
3231
pub enum RandomOffset {
3332
None,
3433
XZ,
3534
XYZ
3635
}
3736

38-
#[derive(PartialEq, Eq, Clone)]
37+
#[derive(PartialEq, Eq, Clone, Copy)]
3938
pub enum Dir {
4039
Down,
4140
Up,
@@ -69,7 +68,7 @@ impl Dir {
6968
}
7069
}
7170

72-
#[derive(Clone)]
71+
#[derive(Clone, Copy)]
7372
pub enum PolymorphDecision {
7473
// Stop and use this block state ID for the model.
7574
PickBlockState(u16),

src/minecraft/nbt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::string::ToString;
66

77
use flate::{ inflate_bytes, inflate_bytes_zlib };
88
use serialize;
9-
use serialize::Decodable;
109
use serialize::hex::ToHex;
1110

1211
use self::Nbt::*;

src/shader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use device;
22
use device::draw::CommandBuffer;
33
use gfx;
44
use gfx::{ Device, DeviceHelper, ToSlice };
5-
use gfx::render;
65
use vecmath::Matrix4;
76

87
static VERTEX: gfx::ShaderSource<'static> = shaders! {
@@ -99,6 +98,7 @@ impl Clone for Vertex {
9998
}
10099
}
101100

101+
#[derive(Copy)]
102102
pub struct Buffer {
103103
buf: gfx::BufferHandle<Vertex>,
104104
batch: gfx::batch::RefBatch<ShaderParam>,

0 commit comments

Comments
 (0)