Skip to content

Commit d2b231c

Browse files
committed
---
yaml --- r: 16318 b: refs/heads/try c: 7d17c2d h: refs/heads/master v: v3
1 parent 7f7ffd7 commit d2b231c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 08520a16978264eb599d4df843794126656f78d3
5+
refs/heads/try: 7d17c2d87ff738aa2f4895255f99e2e89112cbb6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/check_const.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import syntax::ast::*;
22
import syntax::{visit, ast_util, ast_map};
33
import driver::session::session;
44
import std::map::hashmap;
5+
import dvec::{dvec, extensions};
56

67
fn check_crate(sess: session, crate: @crate, ast_map: ast_map::map,
78
def_map: resolve::def_map,
@@ -130,15 +131,15 @@ fn check_item_recursion(sess: session, ast_map: ast_map::map,
130131
sess: session,
131132
ast_map: ast_map::map,
132133
def_map: resolve::def_map,
133-
idstack: @mut [node_id],
134+
idstack: @dvec<node_id>,
134135
};
135136

136137
let env = {
137138
root_it: it,
138139
sess: sess,
139140
ast_map: ast_map,
140141
def_map: def_map,
141-
idstack: @mut []
142+
idstack: @dvec()
142143
};
143144

144145
let visitor = visit::mk_vt(@{
@@ -152,9 +153,9 @@ fn check_item_recursion(sess: session, ast_map: ast_map::map,
152153
if (*env.idstack).contains(it.id) {
153154
env.sess.span_fatal(env.root_it.span, "recursive constant");
154155
}
155-
vec::push(*env.idstack, it.id);
156+
(*env.idstack).push(it.id);
156157
visit::visit_item(it, env, v);
157-
vec::pop(*env.idstack);
158+
(*env.idstack).pop();
158159
}
159160

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

0 commit comments

Comments
 (0)