Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rustup to rustc 1.15.0-nightly (0ed951993 2016-11-14) and bump to 0.0.99 #1344

Merged
merged 5 commits into from
Nov 18, 2016

Conversation

mcarton
Copy link
Member

@mcarton mcarton commented Nov 16, 2016

⚠️ DO NOT MERGE!

This is compiling, but not working at all yet.

See rust-lang/rust#37402, rust-lang/rust#37408, rust-lang/rust#37412, rust-lang/rust#37688 and probably others.

},
_ => (println!("boo"), break), //~ ERROR sub-expression diverges
_ => true || break, //~ ERROR sub-expression diverges
Copy link
Member Author

@mcarton mcarton Nov 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like rustc is able to find some of those by itself now.

@mcarton
Copy link
Member Author

mcarton commented Nov 16, 2016

/me just realized that tests are super-slow because he had RUST_BACKTRACE=1, not because of something he'd changed

@mcarton
Copy link
Member Author

mcarton commented Nov 16, 2016

Well, tests pass locally now, but I want to review that later. There were some huge changes.

},
hir::ItemUnion(..) => {
println!("union definition: {:?}", cx.tcx.opt_lookup_item_type(did));
//println!("union definition: {:?}", cx.tcx.opt_lookup_item_type(did));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, forgot these, thanks dogfood 😅

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oli-obk I don't really know what this should do and it does not appear to be tested. Could you help me there?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just change it to item_type or remove the info entirely just leaving the "union definition" text

@oli-obk
Copy link
Contributor

oli-obk commented Nov 16, 2016

Well, tests pass locally now, but I want to review that later. There was some huge changes.

push it, I'll do a review round

} else {
true
}
matches!(expr.node, ExprBlock(_))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: add tests for that.

.get_parent_node(borrow_id)) {
if adj.autoderefs <= 1 {
.map
.get_parent_node(borrow_id))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix indent here.

if_let_chain! {[
// just one expression in the closure
blk.stmts.is_empty(),
let Some(ref closure_expr) = blk.expr,
// nothing special in the argument, besides reference bindings
Copy link
Member Author

@mcarton mcarton Nov 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: Check that.
EDIT: done.

ExprBlock(ref block) => Some(block),
_ => None,
}
}
Copy link
Member Author

@mcarton mcarton Nov 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: do we ever need the enclosing block of || 1?
EDIT: looks like not.

@oli-obk
Copy link
Contributor

oli-obk commented Nov 18, 2016

I took the liberty of appending to your PR

@mcarton
Copy link
Member Author

mcarton commented Nov 18, 2016

I took the liberty of appending to your PR

Thanks.
I'm going to publish it.

@mcarton mcarton merged commit 276e85b into master Nov 18, 2016
@mcarton mcarton deleted the rustup branch November 18, 2016 12:47
@mcarton mcarton changed the title [WIP] Rustup to rustc 1.15.0-nightly (0ed951993 2016-11-14) Rustup to rustc 1.15.0-nightly (0ed951993 2016-11-14) and bump to 0.0.99 Nov 18, 2016
@mcarton
Copy link
Member Author

mcarton commented Nov 18, 2016

Almost 0.0.:100:!


(although it's probably not the 100th version)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants