Skip to content

Commit c4e36be

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 85949 b: refs/heads/dist-snap c: 2c1d656 h: refs/heads/master i: 85947: f34dd8d v: v3
1 parent 57fe54f commit c4e36be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1294
-1219
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 7c6c7519a75064d11f855de862bcdaddcbe5df4b
9+
refs/heads/dist-snap: 2c1d6568f253a2310a0b4a06064b2cf0271aa6be
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
branch = master
55
[submodule "src/libuv"]
66
path = src/libuv
7-
url = https://github.com/brson/libuv.git
7+
url = https://github.com/alexcrichton/libuv.git
88
branch = master

‎branches/dist-snap/mk/llvm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ifeq ($(CFG_LLVM_ROOT),)
2626

2727
$$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS)
2828
@$$(call E, make: llvm)
29-
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV)
29+
$$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1))
3030
$$(Q)touch $$(LLVM_CONFIG_$(1))
3131
endif
3232

‎branches/dist-snap/mk/platform.mk

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ endef
2626
$(foreach t,$(CFG_TARGET_TRIPLES),$(eval $(call DEF_OSTYPE_VAR,$(t))))
2727
$(foreach t,$(CFG_TARGET_TRIPLES),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
2828

29-
# FIXME: no-omit-frame-pointer is just so that task_start_wrapper
30-
# has a frame pointer and the stack walker can understand it. Turning off
31-
# frame pointers everywhere is overkill
32-
CFG_GCCISH_CFLAGS += -fno-omit-frame-pointer -DUSE_UTF8
29+
CFG_GCCISH_CFLAGS += -DUSE_UTF8
3330

3431
# On Darwin, we need to run dsymutil so the debugging information ends
3532
# up in the right place. On other platforms, it automatically gets
@@ -153,7 +150,6 @@ CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive
153150
CFG_DEF_SUFFIX_x86_64-unknown-linux-gnu := .linux.def
154151
CFG_INSTALL_NAME_x86_64-unknown-linux-gnu =
155152
CFG_LIBUV_LINK_FLAGS_x86_64-unknown-linux-gnu =
156-
CFG_LLVM_BUILD_ENV_x86_64-unknown-linux-gnu="CXXFLAGS=-fno-omit-frame-pointer"
157153
CFG_EXE_SUFFIX_x86_64-unknown-linux-gnu =
158154
CFG_WINDOWSY_x86_64-unknown-linux-gnu :=
159155
CFG_UNIXY_x86_64-unknown-linux-gnu := 1
@@ -179,7 +175,6 @@ CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive
179175
CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
180176
CFG_INSTALL_NAME_i686-unknown-linux-gnu =
181177
CFG_LIBUV_LINK_FLAGS_i686-unknown-linux-gnu =
182-
CFG_LLVM_BUILD_ENV_i686-unknown-linux-gnu="CXXFLAGS=-fno-omit-frame-pointer"
183178
CFG_EXE_SUFFIX_i686-unknown-linux-gnu =
184179
CFG_WINDOWSY_i686-unknown-linux-gnu :=
185180
CFG_UNIXY_i686-unknown-linux-gnu := 1

‎branches/dist-snap/mk/rt.mk

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,36 +168,49 @@ LIBUV_DEPS := $$(wildcard \
168168
$$(S)src/libuv/*/*/*/*)
169169
endif
170170

171+
LIBUV_GYP := $$(S)src/libuv/build/gyp
172+
LIBUV_MAKEFILE_$(1)_$(2) := $$(CFG_BUILD_DIR)rt/$(1)/stage$(2)/libuv/Makefile
173+
LIBUV_NO_LOAD = run-benchmarks.target.mk run-tests.target.mk \
174+
uv_dtrace_header.target.mk uv_dtrace_provider.target.mk
175+
176+
$$(LIBUV_MAKEFILE_$(1)_$(2)): $$(LIBUV_GYP)
177+
(cd $(S)src/libuv/ && \
178+
$$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
179+
-Goutput_dir=$$(@D) --generator-output $$(@D))
180+
171181
# XXX: Shouldn't need platform-specific conditions here
172182
ifdef CFG_WINDOWSY_$(1)
173183
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
174-
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
175-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
176-
OS=mingw \
184+
$$(Q)rm -f $$(S)src/libuv/libuv.a
185+
$$(Q)$$(MAKE) -C $$(S)src/libuv -f Makefile.mingw \
186+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
187+
AR="$$(AR_$(1))" \
177188
V=$$(VERBOSE)
189+
$$(Q)cp $$(S)src/libuv/libuv.a $$@
178190
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
179-
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
180-
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
191+
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)_$(2))
192+
$$(Q)$$(MAKE) -C $$(@D) \
181193
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
182194
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
183195
CC="$$(CC_$(1))" \
184196
CXX="$$(CXX_$(1))" \
185-
LINK="$$(CXX_$(1))" \
186197
AR="$$(AR_$(1))" \
187-
PLATFORM=android \
188-
BUILDTYPE=Release \
189-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
190198
host=android OS=linux \
199+
builddir="." \
200+
BUILDTYPE=Release \
201+
NO_LOAD="$$(LIBUV_NO_LOAD)" \
191202
V=$$(VERBOSE)
192203
else
193-
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
194-
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
204+
$$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)_$(2))
205+
$$(Q)$$(MAKE) -C $$(@D) \
195206
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
196207
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
197208
CC="$$(CC_$(1))" \
198209
CXX="$$(CXX_$(1))" \
199210
AR="$$(AR_$(1))" \
200-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/libuv" \
211+
builddir="." \
212+
BUILDTYPE=Release \
213+
NO_LOAD="$$(LIBUV_NO_LOAD)" \
201214
V=$$(VERBOSE)
202215
endif
203216

@@ -261,3 +274,7 @@ endef
261274
$(foreach stage,$(STAGES), \
262275
$(foreach target,$(CFG_TARGET_TRIPLES), \
263276
$(eval $(call DEF_RUNTIME_TARGETS,$(target),$(stage)))))
277+
278+
$(LIBUV_GYP):
279+
mkdir -p $(S)src/libuv/build
280+
git clone https://git.chromium.org/external/gyp.git $(S)src/libuv/build/gyp

‎branches/dist-snap/mk/tests.mk

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -476,15 +476,15 @@ RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
476476
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
477477
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
478478
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
479-
BENCH_RS := $(wildcard $(S)src/test/bench/rt/*.rs $(S)src/test/bench/shootout/*.rs $(S)src/test/bench/std/*.rs $(S)src/test/bench/*.rs)
479+
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
480480
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
481481
DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
482482
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
483483
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
484484

485485
# perf tests are the same as bench tests only they run under
486486
# a performance monitor.
487-
PERF_RS := $(BENCH_RS)
487+
PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
488488

489489
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
490490
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
@@ -516,7 +516,7 @@ CTEST_BUILD_BASE_cfail = compile-fail
516516
CTEST_MODE_cfail = compile-fail
517517
CTEST_RUNTOOL_cfail = $(CTEST_RUNTOOL)
518518

519-
CTEST_SRC_BASE_bench = bench bench/rt bench/shootout bench/std
519+
CTEST_SRC_BASE_bench = bench
520520
CTEST_BUILD_BASE_bench = bench
521521
CTEST_MODE_bench = run-pass
522522
CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL)
@@ -610,8 +610,7 @@ define DEF_RUN_COMPILETEST
610610

611611
CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
612612
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
613-
$(foreach base,$$(CTEST_SRC_BASE_$(4)), \
614-
--src-base $$(S)src/test/$$(base))/ \
613+
--src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \
615614
--build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \
616615
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
617616
--mode $$(CTEST_MODE_$(4)) \

‎branches/dist-snap/src/compiletest/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub struct config {
3636
llvm_bin_path: Option<Path>,
3737

3838
// The directory containing the tests to run
39-
src_base: ~[Path],
39+
src_base: Path,
4040

4141
// The directory where programs should be built
4242
build_base: Path,

‎branches/dist-snap/src/compiletest/compiletest.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::os;
1919
use std::f64;
2020

2121
use extra::getopts;
22-
use extra::getopts::groups::{optopt, optflag, reqopt, optmulti};
22+
use extra::getopts::groups::{optopt, optflag, reqopt};
2323
use extra::test;
2424

2525
use common::config;
@@ -49,19 +49,19 @@ pub fn main() {
4949
pub fn parse_config(args: ~[~str]) -> config {
5050

5151
let groups : ~[getopts::groups::OptGroup] =
52-
~[reqopt ("", "compile-lib-path", "path to host shared libraries", "PATH"),
53-
reqopt ("", "run-lib-path", "path to target shared libraries", "PATH"),
54-
reqopt ("", "rustc-path", "path to rustc to use for compiling", "PATH"),
55-
optopt ("", "clang-path", "path to executable for codegen tests", "PATH"),
56-
optopt ("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
57-
optmulti ("", "src-base", "directory to scan for test files", "PATH"),
58-
reqopt ("", "build-base", "directory to deposit test outputs", "PATH"),
59-
reqopt ("", "aux-base", "directory to find auxiliary test files", "PATH"),
60-
reqopt ("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
61-
reqopt ("", "mode", "which sort of compile tests to run",
62-
" (compile-fail|run-fail|run-pass|pretty|debug-info)"),
63-
optflag ("", "ignored", "run tests marked as ignored / xfailed"),
64-
optopt ("", "runtool", "supervisor program to run tests under \
52+
~[reqopt("", "compile-lib-path", "path to host shared libraries", "PATH"),
53+
reqopt("", "run-lib-path", "path to target shared libraries", "PATH"),
54+
reqopt("", "rustc-path", "path to rustc to use for compiling", "PATH"),
55+
optopt("", "clang-path", "path to executable for codegen tests", "PATH"),
56+
optopt("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
57+
reqopt("", "src-base", "directory to scan for test files", "PATH"),
58+
reqopt("", "build-base", "directory to deposit test outputs", "PATH"),
59+
reqopt("", "aux-base", "directory to find auxiliary test files", "PATH"),
60+
reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
61+
reqopt("", "mode", "which sort of compile tests to run",
62+
"(compile-fail|run-fail|run-pass|pretty|debug-info)"),
63+
optflag("", "ignored", "run tests marked as ignored / xfailed"),
64+
optopt("", "runtool", "supervisor program to run tests under \
6565
(eg. emulator, valgrind)", "PROGRAM"),
6666
optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),
6767
optflag("", "verbose", "run tests verbosely, showing all output"),
@@ -106,15 +106,13 @@ pub fn parse_config(args: ~[~str]) -> config {
106106
Path(getopts::opt_str(m, nm))
107107
}
108108

109-
let src_base = getopts::opt_strs(matches, "src-base");
110-
111109
config {
112110
compile_lib_path: getopts::opt_str(matches, "compile-lib-path"),
113111
run_lib_path: getopts::opt_str(matches, "run-lib-path"),
114112
rustc_path: opt_path(matches, "rustc-path"),
115113
clang_path: getopts::opt_maybe_str(matches, "clang-path").map_move(|s| Path(s)),
116114
llvm_bin_path: getopts::opt_maybe_str(matches, "llvm-bin-path").map_move(|s| Path(s)),
117-
src_base: src_base.iter().map(|x| Path(x.clone())).collect(),
115+
src_base: opt_path(matches, "src-base"),
118116
build_base: opt_path(matches, "build-base"),
119117
aux_base: opt_path(matches, "aux-base"),
120118
stage_id: getopts::opt_str(matches, "stage-id"),
@@ -250,7 +248,7 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
250248
debug!("making tests from %s",
251249
config.src_base.to_str());
252250
let mut tests = ~[];
253-
let dirs = config.src_base.iter().flat_map(|x| os::list_dir_path(x).move_iter()).to_owned_vec();
251+
let dirs = os::list_dir_path(&config.src_base);
254252
for file in dirs.iter() {
255253
let file = file.clone();
256254
debug!("inspecting file %s", file.to_str());

‎branches/dist-snap/src/compiletest/procsrv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ pub fn run(lib_path: &str,
5454
in_fd: None,
5555
out_fd: None,
5656
err_fd: None
57-
});
57+
}).unwrap();
5858

5959
for input in input.iter() {
60-
proc.input().write_str(*input);
60+
proc.input().write(input.as_bytes());
6161
}
6262
let output = proc.finish_with_output();
6363

‎branches/dist-snap/src/compiletest/runtest.rs

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,16 @@ use procsrv;
2020
use util;
2121
use util::logv;
2222

23-
use std::cell::Cell;
2423
use std::io;
2524
use std::os;
2625
use std::str;
27-
use std::task::{spawn_sched, SingleThreaded};
2826
use std::vec;
29-
use std::unstable::running_on_valgrind;
3027

3128
use extra::test::MetricMap;
3229

3330
pub fn run(config: config, testfile: ~str) {
34-
let config = Cell::new(config);
35-
let testfile = Cell::new(testfile);
36-
// FIXME #6436: Creating another thread to run the test because this
37-
// is going to call waitpid. The new scheduler has some strange
38-
// interaction between the blocking tasks and 'friend' schedulers
39-
// that destroys parallelism if we let normal schedulers block.
40-
// It should be possible to remove this spawn once std::run is
41-
// rewritten to be non-blocking.
42-
//
43-
// We do _not_ create another thread if we're running on V because
44-
// it serializes all threads anyways.
45-
if running_on_valgrind() {
46-
let config = config.take();
47-
let testfile = testfile.take();
48-
let mut _mm = MetricMap::new();
49-
run_metrics(config, testfile, &mut _mm);
50-
} else {
51-
do spawn_sched(SingleThreaded) {
52-
let config = config.take();
53-
let testfile = testfile.take();
54-
let mut _mm = MetricMap::new();
55-
run_metrics(config, testfile, &mut _mm);
56-
}
57-
}
31+
let mut _mm = MetricMap::new();
32+
run_metrics(config, testfile, &mut _mm);
5833
}
5934

6035
pub fn run_metrics(config: config, testfile: ~str, mm: &mut MetricMap) {

‎branches/dist-snap/src/etc/emacs/rust-mode.el

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929

3030
table))
3131

32-
(defcustom rust-indent-offset 4
33-
"*Indent Rust code by this number of spaces.")
32+
(defcustom rust-indent-offset default-tab-width
33+
"*Indent Rust code by this number of spaces.
34+
35+
The initializer is `DEFAULT-TAB-WIDTH'.")
3436

3537
(defun rust-paren-level () (nth 0 (syntax-ppss)))
3638
(defun rust-in-str-or-cmnt () (nth 8 (syntax-ppss)))
@@ -59,7 +61,7 @@
5961

6062
;; If we're in any other token-tree / sexp, then:
6163
;; - [ or ( means line up with the opening token
62-
;; - { means indent to either nesting-level * rust-indent-offset,
64+
;; - { means indent to either nesting-level * tab width,
6365
;; or one further indent from that if either current line
6466
;; begins with 'else', or previous line didn't end in
6567
;; semi, comma or brace, and wasn't an attribute. PHEW.

‎branches/dist-snap/src/libextra/test.rs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ The FILTER is matched against the name of all tests to run, and if any tests
203203
have a substring match, only those tests are run.
204204
205205
By default, all tests are run in parallel. This can be altered with the
206-
RUST_TEST_TASKS environment variable when running tests (set it to 1).
206+
RUST_THREADS environment variable when running tests (set it to 1).
207207
208208
Test Attributes:
209209
@@ -740,20 +740,9 @@ static SCHED_OVERCOMMIT : uint = 4u;
740740

741741
fn get_concurrency() -> uint {
742742
use std::rt;
743-
match os::getenv("RUST_TEST_TASKS") {
744-
Some(s) => {
745-
let opt_n: Option<uint> = FromStr::from_str(s);
746-
match opt_n {
747-
Some(n) if n > 0 => n,
748-
_ => fail!("RUST_TEST_TASKS is `%s`, should be a non-negative integer.", s)
749-
}
750-
}
751-
None => {
752-
let threads = rt::util::default_sched_threads();
753-
if threads == 1 { 1 }
754-
else { threads * SCHED_OVERCOMMIT }
755-
}
756-
}
743+
let threads = rt::util::default_sched_threads();
744+
if threads == 1 { 1 }
745+
else { threads * SCHED_OVERCOMMIT }
757746
}
758747

759748
pub fn filter_tests(

‎branches/dist-snap/src/librustc/middle/trans/base.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ use syntax::parse::token::{special_idents};
8787
use syntax::print::pprust::stmt_to_str;
8888
use syntax::{ast, ast_util, codemap, ast_map};
8989
use syntax::abi::{X86, X86_64, Arm, Mips};
90+
use syntax::visit::Visitor;
9091

9192
pub use middle::trans::context::task_llcx;
9293

@@ -2162,6 +2163,14 @@ pub fn trans_enum_def(ccx: @mut CrateContext, enum_definition: &ast::enum_def,
21622163
}
21632164
}
21642165

2166+
pub struct TransItemVisitor;
2167+
2168+
impl Visitor<@mut CrateContext> for TransItemVisitor {
2169+
fn visit_item(&mut self, i: @ast::item, ccx: @mut CrateContext) {
2170+
trans_item(ccx, i);
2171+
}
2172+
}
2173+
21652174
pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
21662175
let _icx = push_ctxt("trans_item");
21672176
let path = match ccx.tcx.items.get_copy(&item.id) {
@@ -2193,15 +2202,10 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
21932202
item.id,
21942203
item.attrs);
21952204
} else {
2196-
for stmt in body.stmts.iter() {
2197-
match stmt.node {
2198-
ast::stmt_decl(@codemap::spanned { node: ast::decl_item(i),
2199-
_ }, _) => {
2200-
trans_item(ccx, i);
2201-
}
2202-
_ => ()
2203-
}
2204-
}
2205+
// Be sure to travel more than just one layer deep to catch nested
2206+
// items in blocks and such.
2207+
let mut v = TransItemVisitor;
2208+
v.visit_block(body, ccx);
22052209
}
22062210
}
22072211
ast::item_impl(ref generics, _, _, ref ms) => {

0 commit comments

Comments
 (0)