search

softdevteam / ykrustc

Yorick Meta-tracer
Other
6 stars 4 forks source link

Yk sync 20200904 #129

Closed vext01 closed 4 years ago

vext01 commented 4 years ago

This syncs upstream.

I've left a couple of commits on the end for review. I'll squash them later.

@bjorn3 Do you know why deps.rs needs to diverge from upstream (final commit), other than the new deps we added of course? Weird, right?

Works with yk, and all tests pass.

bjorn3 commented 4 years ago

The Cargo.lock seems to have changed a lot. (https://github.com/softdevteam/ykrustc/compare/ef55a0a92f3cb6572ef67d99f4aefbdeb7b6b804...b821f14b02cbb4dd423ac9ceb7354537982a42a1) Try resetting Cargo.lock to the one of ef55a0a92f3cb6572ef67d99f4aefbdeb7b6b804.

ptersilie commented 4 years ago

The deps diff looks weird (it mostly changes comments) or is it just because it hasn't been squashed yet. Otherwise looks fine.

vext01 commented 4 years ago

The deps change is mostly the doing of x.py fmt, but there are other changes.

Will try @bjorn3's suggestion.

vext01 commented 4 years ago

That worked!

vext01 commented 4 years ago

OK to squash?

ptersilie commented 4 years ago

Please do.

vext01 commented 4 years ago

splat

ptersilie commented 4 years ago

bors r+

bors[bot] commented 4 years ago

Build succeeded: