Skip to content

Commit 6bcc278

Browse files
committed
---
yaml --- r: 10676 b: refs/heads/snap-stage3 c: 47b1b7a h: refs/heads/master v: v3
1 parent ddd50ed commit 6bcc278

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 5cf99e02b5f430812e8bce64bcf55c2194ace3ca
4+
refs/heads/snap-stage3: 47b1b7a207c6fa1c0af0dfc789c253f6c40bbf7f
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rustc/middle/typeck.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ fn check_main_fn_ty(ccx: @crate_ctxt,
271271
}
272272
}
273273

274-
fn check_for_main_fn(ccx: @crate_ctxt, crate: @ast::crate) {
274+
fn check_for_main_fn(ccx: @crate_ctxt) {
275275
let tcx = ccx.tcx;
276276
if !tcx.sess.building_library {
277277
alt copy tcx.sess.main_fn {
278278
some((id, sp)) { check_main_fn_ty(ccx, id, sp); }
279-
none { tcx.sess.span_err(crate.span, "main function not found"); }
279+
none { tcx.sess.err("main function not found"); }
280280
}
281281
}
282282
}
@@ -289,7 +289,7 @@ fn check_crate(tcx: ty::ctxt, impl_map: resolve::impl_map,
289289
tcx: tcx};
290290
collect::collect_item_types(ccx, crate);
291291
check::check_item_types(ccx, crate);
292-
check_for_main_fn(ccx, crate);
292+
check_for_main_fn(ccx);
293293
tcx.sess.abort_if_errors();
294294
(ccx.method_map, ccx.vtable_map)
295295
}

0 commit comments

Comments
 (0)