Increment version, force all types to be unsized.

Author: TomBebbington

Cargo.lock

@@ -24,5 +24,5 @@ cbox = "0.*"
 libc = "0.*"
 
 [dependencies.llvm-sys]
-version = "*"
-git = "https://github.com/TomBebbington/llvm-sys.rs"
+version = "0.*"
+git = "https://github.com/TomBebbington/llvm-rs"

Cargo.toml

@@ -1,10 +1,11 @@
 use ffi::core;
 use ffi::prelude::LLVMBasicBlockRef;
+use std::marker::PhantomData;
 use value::Function;
 use util;
 
 /// A container of instructions that execute sequentially.
-pub struct BasicBlock;
+pub struct BasicBlock(PhantomData<[u8]>);
 native_ref!(&BasicBlock = LLVMBasicBlockRef);
 impl BasicBlock {
     /// Return the enclosing method, or `None` if it is not attached to a method.

src/block.rs

@@ -3,11 +3,12 @@ use ffi::{core, LLVMMemoryBuffer};
 use ffi::prelude::LLVMMemoryBufferRef;
 use cbox::{CBox, DisposeRef};
 use std::ops::Deref;
+use std::marker::PhantomData;
 use std::mem;
 use util;
 
 
-pub struct MemoryBuffer;
+pub struct MemoryBuffer(PhantomData<[u8]>);
 native_ref!(&MemoryBuffer = LLVMMemoryBufferRef);
 impl MemoryBuffer {
     pub fn new_from_file(path: &str) -> Result<CBox<MemoryBuffer>, CBox<str>> {

src/buffer.rs

@@ -2,16 +2,17 @@ use libc::{c_char, c_uint};
 use ffi::prelude::{LLVMBuilderRef, LLVMValueRef};
 use ffi::{core, LLVMBuilder, LLVMRealPredicate, LLVMIntPredicate};
 use cbox::{CSemiBox, DisposeRef};
+use std::marker::PhantomData;
 use std::mem;
 use block::BasicBlock;
 use context::Context;
-use ty::Type;
+use types::Type;
 use value::{Function, Value, Predicate};
 
 static NULL_NAME:[c_char; 1] = [0];
 
 /// This provides a uniform API for creating instructions and inserting them into a basic block.
-pub struct Builder;
+pub struct Builder(PhantomData<[u8]>);
 native_ref!(&Builder = LLVMBuilderRef);
 macro_rules! bin_op(
     ($name:ident, $func:ident) => (

src/builder.rs

@@ -4,7 +4,7 @@ use ffi::prelude::LLVMValueRef;
 use context::Context;
 use libc::c_char;
 use value::Value;
-use ty::*;
+use types::*;
 use std::mem;
 use std::ffi::CStr;
 

src/compile.rs

@@ -1,13 +1,14 @@
 use ffi::prelude::LLVMContextRef;
 use ffi::{core, LLVMContext};
+use std::marker::PhantomData;
 use cbox::CBox;
 
 /// Contains all the LLVM entities - mainly modules.
 ///
 /// Every single entity attached to it has its lifetime to enforce the
 /// rule that things from different contexts cannot interact and to
 /// preserve pointer safety.
-pub struct Context;
+pub struct Context(PhantomData<[u8]>);
 native_ref!(&Context = LLVMContextRef);
 impl Context {
     /// Get a reference to the global context.

src/context.rs

@@ -9,7 +9,7 @@ use std::{mem, ptr};
 use compile::Compile;
 use context::{Context, GetContext};
 use module::Module;
-use ty::{StructType, Type};
+use types::{StructType, Type};
 use util::{self, Sub};
 use value::{Function, Value};
 

src/engine.rs

@@ -19,8 +19,8 @@ mod engine;
 mod module;
 mod object;
 mod target;
-mod ty;
-mod value;
+pub mod types;
+pub mod value;
 mod util;
 
 pub use cbox::{CBox, CSemiBox};
@@ -32,6 +32,6 @@ pub use engine::{JitEngine, JitOptions, Interpreter, ExecutionEngine, GenericVal
 pub use module::{AddressSpace, Module, Functions};
 pub use object::{ObjectFile, Symbol, Symbols};
 pub use target::{TargetData, Target};
-pub use ty::{FunctionType, StructType, Type};
+pub use types::*;
 pub use value::{Alias, Arg, Attribute, Value, Function, GlobalValue, GlobalVariable, Linkage, Predicate};
 pub use util::Sub;

src/lib.rs

@@ -17,13 +17,13 @@ use std::process::Command;
 use buffer::MemoryBuffer;
 use context::{Context, GetContext};
 use value::{Alias, Function, GlobalValue, GlobalVariable, Value};
-use ty::Type;
+use types::Type;
 use util;
 
 /// Represents a single compilation unit of code.
 ///
 /// This is attached to the lifetime of the context that constructs it, but is owned by the `CSemiBox`.
-pub struct Module;
+pub struct Module(PhantomData<[u8]>);
 native_ref!(&Module = LLVMModuleRef);
 impl Module {
     /// Create a new module in the context given with the name given.