Skip to content

Commit ae38935

Browse files
committed
Remove DVec from check_const
1 parent 7a6db3f commit ae38935

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/librustc/middle/check_const.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use middle::ty;
1616
use middle::typeck;
1717
use util::ppaux;
1818

19-
use core::dvec::DVec;
2019
use core::option;
2120
use std::oldmap::HashMap;
2221
use syntax::ast::*;
@@ -212,20 +211,20 @@ pub fn check_item_recursion(sess: Session,
212211
ast_map: ast_map::map,
213212
def_map: resolve::DefMap,
214213
it: @item) {
215-
type env = {
214+
struct env {
216215
root_it: @item,
217216
sess: Session,
218217
ast_map: ast_map::map,
219218
def_map: resolve::DefMap,
220-
idstack: @DVec<node_id>,
221-
};
219+
idstack: @mut ~[node_id]
220+
}
222221

223-
let env = {
222+
let env = env {
224223
root_it: it,
225224
sess: sess,
226225
ast_map: ast_map,
227226
def_map: def_map,
228-
idstack: @DVec()
227+
idstack: @mut ~[]
229228
};
230229

231230
let visitor = visit::mk_vt(@visit::Visitor {
@@ -236,12 +235,12 @@ pub fn check_item_recursion(sess: Session,
236235
(visitor.visit_item)(it, env, visitor);
237236

238237
fn visit_item(it: @item, &&env: env, v: visit::vt<env>) {
239-
if (*env.idstack).contains(&(it.id)) {
238+
if env.idstack.contains(&(it.id)) {
240239
env.sess.span_fatal(env.root_it.span, ~"recursive constant");
241240
}
242-
(*env.idstack).push(it.id);
241+
env.idstack.push(it.id);
243242
visit::visit_item(it, env, v);
244-
(*env.idstack).pop();
243+
env.idstack.pop();
245244
}
246245

247246
fn visit_expr(e: @expr, &&env: env, v: visit::vt<env>) {

0 commit comments

Comments
 (0)