about summary refs log tree commit diff
path: root/src/librustc_borrowck
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-05-18 05:04:26 -0700
committerbors <bors@rust-lang.org>2016-05-18 05:04:26 -0700
commit9743c661b0e768997cf4af1c8da8d5838e1c2c2f (patch)
treee8cfab86268a4efe3a54225e186c943d94f2a434 /src/librustc_borrowck
parent310d8996f40fceaa8d294577276cfb1b080c8bc9 (diff)
parent07194a035089407e2706b543f29eba68f0e9abd5 (diff)
downloadrust-9743c661b0e768997cf4af1c8da8d5838e1c2c2f.tar.gz
rust-9743c661b0e768997cf4af1c8da8d5838e1c2c2f.zip
Auto merge of #33710 - Manishearth:rollup, r=Manishearth
Rollup of 5 pull requests

- Successful merges: #33656, #33666, #33673, #33675, #33695
- Failed merges:
Diffstat (limited to 'src/librustc_borrowck')
-rw-r--r--src/librustc_borrowck/diagnostics.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_borrowck/diagnostics.rs b/src/librustc_borrowck/diagnostics.rs
index cdbad685008..b5d8192b4dd 100644
--- a/src/librustc_borrowck/diagnostics.rs
+++ b/src/librustc_borrowck/diagnostics.rs
@@ -391,6 +391,7 @@ fn you_know_nothing(jon_snow: &mut i32) {
                        //        but it is already borrowed
     };
 }
+```
 
 In here, `jon_snow` is already borrowed by the `nights_watch` closure, so it
 cannot be borrowed by the `starks` closure at the same time. To fix this issue,