search

softdevteam / ykrustc

Yorick Meta-tracer
Other
6 stars 4 forks source link

Sync upstream #102

Closed vext01 closed 4 years ago

vext01 commented 4 years ago

This syncs upstream as of 2020-05-07.

Most of the things I had to fix were uninteresting apart from the mir-opt test change.

Our SIR tests used to piggy back on a lot of mir-opt test infrastructure, but they've since changed all of that and removed the ability to elide in expected test outcomes. We have tests that use elision for good reason, so I've forward ported some of the old mir-opt test stuff into our tree.

That stuff is in runtest_sir.rs.

Tests are passing, and I also checked yk works too.

ptersilie commented 4 years ago

bors r+

vext01 commented 4 years ago

Looks like bors did something weird

ptersilie commented 4 years ago

Try again?

bors r+

vext01 commented 4 years ago

I guess so

ptersilie commented 4 years ago

Hmm, bors doesn't seem to be reacting at all.

ptersilie commented 4 years ago

bors ping

bors[bot] commented 4 years ago

pong

ptersilie commented 4 years ago

bors r+

vext01 commented 4 years ago

bors crashed again :\

vext01 commented 4 years ago

bors try

vext01 commented 4 years ago

bors r-

ltratt commented 4 years ago

bors r+

ltratt commented 4 years ago

bors ping

bors[bot] commented 4 years ago

pong

ltratt commented 4 years ago

bors r+

ltratt commented 4 years ago

bors r+

vext01 commented 4 years ago

reinstalled bors.

bors ping

bors[bot] commented 4 years ago

pong

vext01 commented 4 years ago

bors try

vext01 commented 4 years ago

Let's try re-raising the PR.

bors[bot] commented 4 years ago

try

Merge conflict.