Code

Issue 6801 borrowck closures#12158

Code

Merged

bors merged 33 commits intorust-lang:masterrust-lang/rust:masterfrom nikomatsakis:issue-6801-borrowck-closuresnikomatsakis/rust:issue-6801-borrowck-closuresCopy head branch name to clipboardFeb 12, 2014

Commits

Commits on Feb 11, 2014

• std -- replaces uses where const borrows would be required

  nikomatsakis

  committed
  852a49f

  Copy full SHA for 852a49f

• remove antiquated reflect test rather than bring it up to date

  nikomatsakis

  committed
  96139bf

  Copy full SHA for 96139bf

• libglob -- patch closure where const borrow would have helped

  nikomatsakis

  committed
  6f571a6

  Copy full SHA for 6f571a6

• container -- update example to contain scope of closure borrow

  nikomatsakis

  committed
  0f5baad

  Copy full SHA for 0f5baad

• to_str -- update to contain scope of closure

  nikomatsakis

  committed
  0e005ab

  Copy full SHA for 0e005ab

• ty -- minor refactorings, helper methods

  nikomatsakis

  committed
  f7e5d84

  Copy full SHA for f7e5d84

• trans/datum -- move mutable variable into closure

  nikomatsakis

  committed
  64c9b5c

  Copy full SHA for 64c9b5c

• error_reporting -- explain reborrowed upvar constraints in a hopefully useful way

  nikomatsakis

  committed
  7286e35

  Copy full SHA for 7286e35

• metadata -- remove tiny convenience closure that was causing conflicting mutable borrows

  nikomatsakis

  committed
  949e1c7

  Copy full SHA for 949e1c7

• resolve -- rewrite conflict closure into method

  nikomatsakis

  committed
  b2b4c79

  Copy full SHA for b2b4c79

• syntax/ext/format -- rewrite conflicting closures into methods

  nikomatsakis

  committed
  ca65c00

  Copy full SHA for ca65c00

• syntax/fold -- remove conflicting (and rather pointless) closures

  nikomatsakis

  committed
  7ba5bef

  Copy full SHA for 7ba5bef

• vec -- introduce local var to make clear what subportion is being borrowed

  nikomatsakis

  committed
  8b760fd

  Copy full SHA for 8b760fd

• back/link -- introduce block to clarify scope of closure

  nikomatsakis

  committed
  95c53c0

  Copy full SHA for 95c53c0

• ppaux -- add Repr implementations

  nikomatsakis

  committed
  42cd820

  Copy full SHA for 42cd820

• io -- introduce local to avoid conflicting borrow

  nikomatsakis

  committed
  c9c8049

  Copy full SHA for c9c8049

• librustdoc -- move closure to clarify scope

  nikomatsakis

  committed
  8dff89c

  Copy full SHA for 8dff89c

• sha2 -- introduce locals to clarify which subportions are being borrowed

  nikomatsakis

  committed
  b0ac40a

  Copy full SHA for b0ac40a

• str -- borrow fields of self for use in closure since self.iter is borrowed

  nikomatsakis

  committed
  e3ca1c2

  Copy full SHA for e3ca1c2

• libsyntax -- combine two iter ops into one so that fld does not need to be mutably shared between them both

  nikomatsakis

  committed
  ec6d122

  Copy full SHA for ec6d122

• front -- collapse iterator actions that require access to the same &mut state

  nikomatsakis

  committed
  7ffa67c

  Copy full SHA for 7ffa67c

• libgetopts -- fix unsafe sharing in closures

  nikomatsakis

  committed
  c756038

  Copy full SHA for c756038

• libsyntax -- fix unsafe sharing in closures

  nikomatsakis

  committed
  56c5d4c

  Copy full SHA for 56c5d4c

• librustuv -- fix unsafe sharing in rustuv

  nikomatsakis

  committed
  844eab1

  Copy full SHA for 844eab1

• region -- Improve comments in region.rs

  nikomatsakis

  committed
  807def0

  Copy full SHA for 807def0

• add upvar_borrow_map to tcx and fcx in typeck

  nikomatsakis

  committed
  b1962a2

  Copy full SHA for b1962a2

• regionck -- rewrite in terms of mem_categorization, compute upvar borrow kinds

  nikomatsakis

  committed
  d45dd27

  Copy full SHA for d45dd27

• mem_categorization -- parameterize over TYPER interface, treat upvar refs as

  Show description for db38192
  nikomatsakis

  committed
  db38192

  Copy full SHA for db38192

• borrowck -- treak borrows from closures like other borrows

  nikomatsakis

  committed
  6b8b751

  Copy full SHA for 6b8b751

• dataflow -- do not consider the interprocedural case

  nikomatsakis

  committed
  1bd7b18

  Copy full SHA for 1bd7b18

• test -- update tests with new error messages

  nikomatsakis

  committed
  3805c54

  Copy full SHA for 3805c54

• test -- add new tests specifically examining closure borrows

  nikomatsakis

  committed
  c9e3cb6

  Copy full SHA for c9e3cb6

• Correct nits from @pcwalton

  nikomatsakis

  committed
  484f0f1

  Copy full SHA for 484f0f1