Skip to content

Commit 9d570ad

Browse files
committed
rustc: remove the last mentions of @fn.
1 parent f0c0c2a commit 9d570ad

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/librustc/middle/mem_categorization.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ use syntax::parse::token;
7676
pub enum categorization {
7777
cat_rvalue(ty::Region), // temporary val, argument is its scope
7878
cat_static_item,
79-
cat_copied_upvar(CopiedUpvar), // upvar copied into @fn or ~fn env
79+
cat_copied_upvar(CopiedUpvar), // upvar copied into proc env
8080
cat_upvar(ty::UpvarId, ty::UpvarBorrow), // by ref upvar from stack closure
8181
cat_local(ast::NodeId), // local variable
8282
cat_arg(ast::NodeId), // formal argument
@@ -1092,7 +1092,7 @@ impl<TYPER:Typer> MemCategorizationContext<TYPER> {
10921092
~"static item"
10931093
}
10941094
cat_copied_upvar(_) => {
1095-
~"captured outer variable in a heap closure"
1095+
~"captured outer variable in a proc"
10961096
}
10971097
cat_rvalue(..) => {
10981098
~"non-lvalue"

src/librustc/middle/trans/closure.rs

+7-10
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,14 @@ use syntax::ast_util;
3838
// roughly as follows:
3939
//
4040
// struct rust_opaque_box { // see rust_internal.h
41-
// unsigned ref_count; // only used for @fn()
42-
// type_desc *tydesc; // describes closure_data struct
43-
// rust_opaque_box *prev; // (used internally by memory alloc)
44-
// rust_opaque_box *next; // (used internally by memory alloc)
41+
// unsigned ref_count; // obsolete (part of @T's header)
42+
// fn(void*) *drop_glue; // destructor (for proc)
43+
// rust_opaque_box *prev; // obsolete (part of @T's header)
44+
// rust_opaque_box *next; // obsolete (part of @T's header)
4545
// struct closure_data {
46-
// type_desc *bound_tdescs[]; // bound descriptors
47-
// struct {
48-
// upvar1_t upvar1;
49-
// ...
50-
// upvarN_t upvarN;
51-
// } bound_data;
46+
// upvar1_t upvar1;
47+
// ...
48+
// upvarN_t upvarN;
5249
// }
5350
// };
5451
//

0 commit comments

Comments
 (0)