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.

Sign up for GitHub

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

Upgrade to nightly #39

Merged
merged 13 commits into from
Sep 23, 2016
Merged

Upgrade to nightly #39

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d56b743
upgrade to nightly as of 2016-09-09, with some hacks
joshuawarner32 Sep 10, 2016
f7736fa
commit Cargo.lock changes
joshuawarner32 Sep 10, 2016
59e39f9
do a little cleanup
joshuawarner32 Sep 10, 2016
2b1ad8a
simplify conditionals
joshuawarner32 Sep 10, 2016
65ad8c4
fix warnings
joshuawarner32 Sep 10, 2016
7464ba3
update compiletest to fix test (build) breakage
joshuawarner32 Sep 14, 2016
4668114
change def_id to trait_id
joshuawarner32 Sep 14, 2016
b2e4d0a
implement Bit{And,Or,Xor}
joshuawarner32 Sep 14, 2016
462a16e
fix checked ops
joshuawarner32 Sep 16, 2016
e1d5f44
fix missing AssertParamIsClone
joshuawarner32 Sep 16, 2016
7ff9081
document new nightly version
joshuawarner32 Sep 16, 2016
b681772
remove default trait methods from tests where possible, to get them p…
joshuawarner32 Sep 20, 2016
5c65677
xfail cmp.rs test, since it uses both default trait methods and gener…
joshuawarner32 Sep 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ extern { }
extern crate rustc_mir;
extern crate syntax;
extern crate rustc_const_math;
extern crate rustc_data_structures;

extern crate libc;

Expand Down
13 changes: 6 additions & 7 deletions src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use rustc::ty::{self, TyCtxt};
use rustc::hir::def_id::DefId;

use std::rc::Rc;
use rustc::traits::{self, ProjectionMode};
use rustc::traits::{self, Reveal};
use rustc::ty::subst::{Substs};
use rustc::ty::fold::TypeFoldable;
use syntax::ast::{Name, DUMMY_NODE_ID};
Expand All @@ -18,15 +18,14 @@ pub fn resolve_trait_method<'a, 'tcx>(
) -> (DefId, &'tcx Substs<'tcx>) {
let method_item = tcx.impl_or_trait_item(def_id);
let trait_id = method_item.container().id();
let trait_ref = ty::Binder(substs.to_trait_ref(*tcx, trait_id));
let trait_ref = ty::Binder(ty::TraitRef::from_method(*tcx, trait_id, substs));
match fulfill_obligation(tcx, trait_ref) {
traits::VtableImpl(vtable_impl) => {
let impl_did = vtable_impl.impl_def_id;
let mname = tcx.item_name(def_id);
// Create a concatenated set of substitutions which includes those from the impl
// and those from the method:
let impl_substs = vtable_impl.substs.with_method_from(substs);
let substs = tcx.mk_substs(impl_substs);
let substs = substs.rebase_onto(*tcx, def_id, vtable_impl.substs);
Copy link

Choose a reason for hiding this comment

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

I think def_id here might need to be trait_id.

let mth = get_impl_method(*tcx, impl_did, substs, mname);

(mth.method.def_id, mth.substs)
Expand Down Expand Up @@ -67,7 +66,7 @@ fn fulfill_obligation<'a, 'tcx>(
) -> traits::Vtable<'tcx, ()> {
// Do the initial selection for the obligation. This yields the shallow result we are
// looking for -- that is, what specific impl.
tcx.normalizing_infer_ctxt(ProjectionMode::Any).enter(|infcx| {
tcx.infer_ctxt(None, None, Reveal::All).enter(|infcx| {
let mut selcx = traits::SelectionContext::new(&infcx);

let obligation = traits::Obligation::new(
Expand Down Expand Up @@ -122,14 +121,14 @@ fn get_impl_method<'a, 'tcx>(
substs: &'tcx Substs<'tcx>,
name: Name,
) -> ImplMethod<'tcx> {
assert!(!substs.types.needs_infer());
assert!(!substs.needs_infer());

let trait_def_id = tcx.trait_id_of_impl(impl_def_id).unwrap();
let trait_def = tcx.lookup_trait_def(trait_def_id);

match trait_def.ancestors(impl_def_id).fn_defs(tcx, name).next() {
Some(node_item) => {
let substs = tcx.normalizing_infer_ctxt(ProjectionMode::Any).enter(|infcx| {
let substs = tcx.infer_ctxt(None, None, Reveal::All).enter(|infcx| {
let substs = traits::translate_substs(&infcx, impl_def_id,
substs, node_item.node);
tcx.lift(&substs).unwrap_or_else(|| {
Expand Down
Loading