Code

First attempt at fixing #20591#24818

Code

Merged

bors merged 6 commits intorust-lang:masterrust-lang/rust:masterfrom tbelaire:double-importtbelaire/rust:double-importCopy head branch name to clipboardMay 12, 2015

+46-12

Commits

Commits on Apr 25, 2015

• First attempt at fixing rust-lang#20591

  Show description for 74648b5
  tbelaire

  committed
  74648b5

  Copy full SHA for 74648b5

• Now passing in the ImportResolver to check_conflict...

  Show description for 168615f
  tbelaire

  committed
  168615f

  Copy full SHA for 168615f

• Maybe it works

  Show description for 69a5c37
  tbelaire

  committed
  69a5c37

  Copy full SHA for 69a5c37

• Fixed types, and slimmed down code

  Show description for 5c05278
  tbelaire

  committed
  5c05278

  Copy full SHA for 5c05278

Commits on Apr 27, 2015

• Fixed test text

  tbelaire

  committed
  372c69d

  Copy full SHA for 372c69d

Commits on May 1, 2015

• Fixed some nits

  tbelaire

  committed
  db9d018

  Copy full SHA for db9d018