librustc: Add missing import. rs=burningtree
Merge remote branch 'nmatsakis/parser-perf-problem' into incoming
Add manual &self/ and &static/ and /&self declarations that
are currently inferred.  New rules are coming that will require
them to be explicit.  All add some explicit self declarations.
Permit either foo/&self or foo<'self>
Update region inference for traits so that a method with
explicit self doesn't incorrectly cause the entire trait to
be tagged as being region-parameterized.
convert FnCtxt methods from @mut self to &self
Convert region parameterization to change defaults and handle
methods correctly
Improve error messages when illegal lifetimes are used
Patch up auto_encode test to avoid unnecessary boxed objects
patch up pretty printing of things with both lifetime and type parameters
patch up merge failure