Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
s/Second borrow/Previous borrow/ in error messages.
When a borrow occurs twice illegally, Rust will label the other borrow as the "second borrow". This is quite confusing, as the "second borrow" usually happened before the flagged borrow (e.g. as far as dataflow is concerned, the first borrow is OK, the second borrow is illegal.) This patch renames "second borrow" to "previous borrow", to make the spatial relationship between the two borrows clearer. Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
- Loading branch information
4584acd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from cmr
at ezyang@4584acd
4584acd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging ezyang/rust/reword-second-borrow = 4584acd into auto
4584acd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ezyang/rust/reword-second-borrow = 4584acd merged ok, testing candidate = f43402f
4584acd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3053
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/896
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/898
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3059
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2161
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2162
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3070
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2159
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2164
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3072
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2160
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2163
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2239
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3058
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2160
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2164
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2834
4584acd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = f43402f