Skip to content

Commit 84281e8

Browse files
committed
Split up miri into the librustc_mir and bin parts
1 parent 6e10752 commit 84281e8

File tree

232 files changed

+437
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+437
-121
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ script:
1515
xargo/build.sh
1616
- |
1717
# Test plain miri
18-
cd src/librustc_mir/ && cargo build &&
18+
cd miri/ && cargo build &&
1919
cargo test &&
2020
cargo install &&
21-
cd ../..
21+
cd ..
2222
- |
2323
# Test cargo miri
2424
cd cargo-miri-test &&
@@ -27,7 +27,7 @@ script:
2727
cd ..
2828
- |
2929
# and run all tests with full mir
30-
cd src/librustc_mir/ && MIRI_SYSROOT=~/.xargo/HOST cargo test && cd ../..
30+
cd miri/ && MIRI_SYSROOT=~/.xargo/HOST cargo test && cd ..
3131
notifications:
3232
email:
3333
on_success: never

miri/Cargo.lock

Lines changed: 266 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

miri/Cargo.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[package]
2+
authors = ["Scott Olson <[email protected]>"]
3+
description = "An experimental interpreter for Rust MIR."
4+
license = "MIT/Apache-2.0"
5+
name = "miri"
6+
repository = "https://github.com/solson/miri"
7+
version = "0.1.0"
8+
9+
[[bin]]
10+
doc = false
11+
name = "miri"
12+
test = false
13+
14+
[[bin]]
15+
doc = false
16+
name = "cargo-miri"
17+
test = false
18+
19+
[lib]
20+
test = false
21+
22+
[dependencies]
23+
byteorder = { version = "1.1", features = ["i128"]}
24+
env_logger = "0.3.3"
25+
log = "0.3.6"
26+
log_settings = "0.1.1"
27+
cargo_metadata = "0.2"
28+
rustc_miri = { path = "../src/librustc_mir" }
29+
30+
[dev-dependencies]
31+
compiletest_rs = "0.2.6"
File renamed without changes.

miri/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
extern crate rustc_miri;
2+
3+
pub use rustc_miri::interpret::*;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/compiletest.rs renamed to miri/tests/compiletest.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@ fn run_pass_miri() {
130130

131131
for &opt in [false, true].iter() {
132132
for_all_targets(&sysroot, |target| {
133-
miri_pass("../../tests/run-pass", &target, &host, false, opt);
133+
miri_pass("tests/run-pass", &target, &host, false, opt);
134134
});
135-
miri_pass("../../tests/run-pass-fullmir", &host, &host, true, opt);
135+
miri_pass("tests/run-pass-fullmir", &host, &host, true, opt);
136136
}
137137
}
138138

139139
#[test]
140140
fn run_pass_rustc() {
141-
run_pass("../../tests/run-pass");
142-
run_pass("../../tests/run-pass-fullmir");
141+
run_pass("tests/run-pass");
142+
run_pass("tests/run-pass-fullmir");
143143
}
144144

145145
#[test]
@@ -148,7 +148,7 @@ fn compile_fail_miri() {
148148
let host = get_host();
149149

150150
for_all_targets(&sysroot, |target| {
151-
compile_fail(&sysroot, "../../tests/compile-fail", &target, &host, false);
151+
compile_fail(&sysroot, "tests/compile-fail", &target, &host, false);
152152
});
153-
compile_fail(&sysroot, "../../tests/compile-fail-fullmir", &host, &host, true);
153+
compile_fail(&sysroot, "tests/compile-fail-fullmir", &host, &host, true);
154154
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

rustc_tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ version = "0.1.0"
44
authors = ["Oliver Schneider <[email protected]>"]
55

66
[dependencies]
7-
miri = { path = ".." }
7+
miri = { path = "../miri" }

0 commit comments

Comments
 (0)