user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4493 from jbclements/rename-moved-variable-to-moved-value

Browse source 
s/moved variable/moved value/
This commit is contained in:
Patrick Walton 2013-01-16 12:30:55 -08:00
commit a2ec5400ff
16 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/librustc/middle/liveness.rs
View file

@ -1662,7 +1662,7 @@ fn check_fn(_fk: visit::fn_kind, _decl: fn_decl,
enum ReadKind {
PossiblyUninitializedVariable,
PossiblyUninitializedField,
MovedVariable
MovedValue
}
impl @Liveness {
@ -1815,7 +1815,7 @@ impl @Liveness {
lnk: LiveNodeKind,
var: Variable) {
// the only time that it is possible to have a moved variable
// the only time that it is possible to have a moved value
// used by ExitNode would be arguments or fields in a ctor.
// we give a slightly different error message in those cases.
if lnk == ExitNode {
@ -1837,7 +1837,7 @@ impl @Liveness {
}
}
self.report_illegal_read(move_span, lnk, var, MovedVariable);
self.report_illegal_read(move_span, lnk, var, MovedValue);
self.tcx.sess.span_note(
move_span, ~"move of variable occurred here");
@ -1852,7 +1852,7 @@ impl @Liveness {
~"possibly uninitialized variable"
}
PossiblyUninitializedField => ~"possibly uninitialized field",
MovedVariable => ~"moved variable"
MovedValue => ~"moved value"
};
let name = (*self.ir).variable_name(var);
match lnk {