diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-01-26 14:02:23 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-26 15:42:32 -0800 |
| commit | 5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f (patch) | |
| tree | b258f900721206035f33e5fcc229474d19448569 /src/librustc_borrowck | |
| parent | d179ba3b8eb65c951b68f6c52da3aba82806a3a1 (diff) | |
| parent | 16286f5cf921a9de463d8a744c33f49837698c3d (diff) | |
| download | rust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.tar.gz rust-5a6fb8eb98f1e8d7188100ef83f25d01f30fff9f.zip | |
Merge remote-tracking branch 'rust-lang/master'
Conflicts: src/librustc/lint/builtin.rs src/librustc/lint/context.rs
Diffstat (limited to 'src/librustc_borrowck')
| -rw-r--r-- | src/librustc_borrowck/borrowck/check_loans.rs | 2 | ||||
| -rw-r--r-- | src/librustc_borrowck/borrowck/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_borrowck/borrowck/check_loans.rs b/src/librustc_borrowck/borrowck/check_loans.rs index 0ade916f639..b66419420e9 100644 --- a/src/librustc_borrowck/borrowck/check_loans.rs +++ b/src/librustc_borrowck/borrowck/check_loans.rs @@ -806,7 +806,7 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> { mc::cat_upvar(mc::Upvar { kind, .. }) => kind, _ => unreachable!() }; - if kind == ty::FnUnboxedClosureKind { + if kind == ty::FnClosureKind { self.bccx.span_err( assignment_span, &format!("cannot assign to {}", diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs index b87fed1601c..449f2a4d006 100644 --- a/src/librustc_borrowck/borrowck/mod.rs +++ b/src/librustc_borrowck/borrowck/mod.rs @@ -845,7 +845,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> { mc::cat_upvar(mc::Upvar { kind, .. }) => kind, _ => unreachable!() }; - if kind == ty::FnUnboxedClosureKind { + if kind == ty::FnClosureKind { self.tcx.sess.span_help( self.tcx.map.span(upvar_id.closure_expr_id), "consider changing this closure to take \ |