Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New scoping rules for safe destruction #21022

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

Closed
wants to merge 16 commits into from
Closed

New scoping rules for safe destruction #21022

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e48786b
Refactored librustc_trans to avoid stack-crossing ref cycle.
pnkfelix Jan 9, 2015
9054273
librustc_trans: accommodate `make tidy` post cycle-breaking refactoring.
pnkfelix Jan 12, 2015
c5dde23
improve `compiletest` error message when path option missing.
pnkfelix Dec 22, 2014
56c39ae
fixes for new rules for lifetimes and destructors.
pnkfelix Dec 13, 2014
8ee3c94
Moved bindings for `taken` and `life_giver` to suit new lifetime rules.
pnkfelix Jan 12, 2015
9a3cb06
rustc_typeck::check::method::probe fixes for new lifetime/dtor rules.
pnkfelix Jan 12, 2015
2e6b699
librustc_typeck::coherence accommodate new lifetime/dtor rules.
pnkfelix Jan 12, 2015
aee4a01
rustc_resolve: shift bindings to accommodate new lifetime/dtor rules.
pnkfelix Jan 12, 2015
382c070
rustc_driver: accommodate new lifetime/dtor rules.
pnkfelix Jan 12, 2015
591d8c8
Add `CodeExtent::Remainder` variant to track a suffix of a block.
pnkfelix Nov 25, 2014
b3c8d28
Port of pcwalton's dtor checker, with following modifications.
pnkfelix Oct 27, 2014
42618e7
checkpoint pcwalton test of new destructor static semantics.
pnkfelix Oct 27, 2014
2316d6c
a new regression test discovered during bootstrapping.
pnkfelix Jan 5, 2015
40b8428
port of pcwalton removal of `#[unsafe_destructor]` check.
pnkfelix Oct 27, 2014
52d9590
region.rs: remove unused variant from `InnermostEnclosingExpr`.
pnkfelix Jan 12, 2015
964db8d
librustc_typeck: remove unused imports
pnkfelix Jan 12, 2015
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
Prev Previous commit
Next Next commit
Moved bindings for taken and life_giver to suit new lifetime rules.
  • Loading branch information
@pnkfelix
pnkfelix committed Jan 12, 2015
commit 8ee3c94f4ebca092bda5a4ee78b44d1a6706dcc1
4 changes: 2 additions & 2 deletions src/librustc/middle/infer/error_reporting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,8 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
let scope_id = same_regions[0].scope_id;
let parent = self.tcx.map.get_parent(scope_id);
let parent_node = self.tcx.map.find(parent);
let taken = lifetimes_in_scope(self.tcx, scope_id);
let life_giver = LifeGiver::with_taken(&taken[]);
let node_inner = match parent_node {
Some(ref node) => match *node {
ast_map::NodeItem(ref item) => {
Expand Down Expand Up @@ -860,8 +862,6 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
};
let (fn_decl, generics, unsafety, ident, expl_self, span)
= node_inner.expect("expect item fn");
let taken = lifetimes_in_scope(self.tcx, scope_id);
let life_giver = LifeGiver::with_taken(&taken[]);
let rebuilder = Rebuilder::new(self.tcx, fn_decl, expl_self,
generics, same_regions, &life_giver);
let (fn_decl, expl_self, generics) = rebuilder.rebuild();
Expand Down