user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into btree

Browse source
This commit is contained in:
Ralf Jung 2019-02-24 12:22:42 +01:00
commit 6edf674f4f
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -5,7 +5,7 @@ authors = ["Scott Olson <scott@solson.me>"]
description = "An experimental interpreter for Rust MIR."
license = "MIT/Apache-2.0"
name = "miri"
repository = "https://github.com/solson/miri"
repository = "https://github.com/rust-lang/miri"
version = "0.1.0"
build = "build.rs"
default-run = "miri"

6
README.md
View file

@ -1,4 +1,4 @@
# Miri [![Build Status](https://travis-ci.org/solson/miri.svg?branch=master)](https://travis-ci.org/solson/miri) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/solson/miri?svg=true)](https://ci.appveyor.com/project/solson63299/miri)
# Miri [![Build Status](https://travis-ci.com/rust-lang/miri.svg?branch=master)](https://travis-ci.com/rust-lang/miri) [![Windows build status](https://ci.appveyor.com/api/projects/status/github/rust-lang/miri?svg=true)](https://ci.appveyor.com/project/rust-lang-libs/miri)
An experimental interpreter for [Rust][rust]'s
@ -28,11 +28,11 @@ Miri has already discovered some [real-world bugs](#bugs-found-by-miri).
Install Miri as a cargo subcommand:
```sh
cargo +nightly install --force --git https://github.com/solson/miri miri
cargo +nightly install --force --git https://github.com/rust-lang/miri miri
```
If this does not work, try using the nightly version given in
[this file](https://raw.githubusercontent.com/solson/miri/master/rust-version). CI
[this file](https://raw.githubusercontent.com/rust-lang/miri/master/rust-version). CI
should ensure that this nightly always works.
You have to use a consistent Rust version for building miri and your project, so

2
tests/run-pass/validation_lifetime_resolution.rs
View file

@ -22,7 +22,7 @@ fn foo<T>(mut x: T) where for<'a> &'a mut T: Id
let _y = x.id();
// Inspecting the trace should show that _y has a type involving a local lifetime, when it gets validated.
// Unfortunately, there doesn't seem to be a way to actually have a test fail if it does not have the right
// type. Currently, this is NOT working correctly; see <https://github.com/solson/miri/issues/298>.
// type. Currently, this is NOT working correctly; see <https://github.com/rust-lang/miri/issues/298>.
}
fn main() {