From 27fe2636698f814debae621f00e1e3df8a7fca85 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Date: Wed, 9 May 2018 14:37:00 +0200
Subject: [PATCH] Move back to a normal folder structure

---
 Cargo.toml                      | 7 ++-----
 {miri => src}/bin/cargo-miri.rs | 0
 {miri => src}/bin/miri.rs       | 0
 {miri => src}/fn_call.rs        | 0
 {miri => src}/helpers.rs        | 0
 {miri => src}/intrinsic.rs      | 0
 {miri => src}/lib.rs            | 0
 {miri => src}/locks.rs          | 0
 {miri => src}/memory.rs         | 0
 {miri => src}/operator.rs       | 0
 {miri => src}/range_map.rs      | 0
 {miri => src}/tls.rs            | 0
 {miri => src}/validation.rs     | 0
 13 files changed, 2 insertions(+), 5 deletions(-)
 rename {miri => src}/bin/cargo-miri.rs (100%)
 rename {miri => src}/bin/miri.rs (100%)
 rename {miri => src}/fn_call.rs (100%)
 rename {miri => src}/helpers.rs (100%)
 rename {miri => src}/intrinsic.rs (100%)
 rename {miri => src}/lib.rs (100%)
 rename {miri => src}/locks.rs (100%)
 rename {miri => src}/memory.rs (100%)
 rename {miri => src}/operator.rs (100%)
 rename {miri => src}/range_map.rs (100%)
 rename {miri => src}/tls.rs (100%)
 rename {miri => src}/validation.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 444c6f60d544..86ac2c040fd1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,17 +10,14 @@ build = "build.rs"
 [[bin]]
 doc = false
 name = "miri"
-path = "miri/bin/miri.rs"
+path = "src/bin/miri.rs"
 
 [[bin]]
 doc = false
 name = "cargo-miri"
-path = "miri/bin/cargo-miri.rs"
+path = "src/bin/cargo-miri.rs"
 required-features = ["cargo_miri"]
 
-[lib]
-path = "miri/lib.rs"
-
 [dependencies]
 byteorder = { version = "1.1", features = ["i128"]}
 cargo_metadata = { version = "0.5", optional = true }
diff --git a/miri/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
similarity index 100%
rename from miri/bin/cargo-miri.rs
rename to src/bin/cargo-miri.rs
diff --git a/miri/bin/miri.rs b/src/bin/miri.rs
similarity index 100%
rename from miri/bin/miri.rs
rename to src/bin/miri.rs
diff --git a/miri/fn_call.rs b/src/fn_call.rs
similarity index 100%
rename from miri/fn_call.rs
rename to src/fn_call.rs
diff --git a/miri/helpers.rs b/src/helpers.rs
similarity index 100%
rename from miri/helpers.rs
rename to src/helpers.rs
diff --git a/miri/intrinsic.rs b/src/intrinsic.rs
similarity index 100%
rename from miri/intrinsic.rs
rename to src/intrinsic.rs
diff --git a/miri/lib.rs b/src/lib.rs
similarity index 100%
rename from miri/lib.rs
rename to src/lib.rs
diff --git a/miri/locks.rs b/src/locks.rs
similarity index 100%
rename from miri/locks.rs
rename to src/locks.rs
diff --git a/miri/memory.rs b/src/memory.rs
similarity index 100%
rename from miri/memory.rs
rename to src/memory.rs
diff --git a/miri/operator.rs b/src/operator.rs
similarity index 100%
rename from miri/operator.rs
rename to src/operator.rs
diff --git a/miri/range_map.rs b/src/range_map.rs
similarity index 100%
rename from miri/range_map.rs
rename to src/range_map.rs
diff --git a/miri/tls.rs b/src/tls.rs
similarity index 100%
rename from miri/tls.rs
rename to src/tls.rs
diff --git a/miri/validation.rs b/src/validation.rs
similarity index 100%
rename from miri/validation.rs
rename to src/validation.rs