Skip to content

Commit 89466ff

Browse files
committed
Rename rustc::middle::unsafeck to fn_usage
I'm going to add further checks unrelated to unsafe. Issue #1038
1 parent 60cfa91 commit 89466ff

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/comp/driver/rustc.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import metadata::{creader, cstore};
55
import syntax::parse::{parser, token};
66
import syntax::{ast, codemap};
77
import front::attr;
8-
import middle::{trans, resolve, freevars, kind, ty, typeck, unsafeck};
8+
import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage};
99
import middle::tstate::ck;
1010
import syntax::print::{pp, pprust};
1111
import util::{ppaux, common, filesearch};
@@ -129,8 +129,8 @@ fn compile_input(sess: session::session, cfg: ast::crate_cfg, input: str,
129129
bind freevars::annotate_freevars(def_map, crate));
130130
let ty_cx = ty::mk_ctxt(sess, def_map, ext_map, ast_map, freevars);
131131
time(time_passes, "typechecking", bind typeck::check_crate(ty_cx, crate));
132-
time(time_passes, "unsafechecking",
133-
bind unsafeck::unsafeck_crate(ty_cx, crate));
132+
time(time_passes, "function usage",
133+
bind fn_usage::check_crate_fn_usage(ty_cx, crate));
134134
time(time_passes, "alt checking",
135135
bind middle::check_alt::check_crate(ty_cx, crate));
136136
if sess.get_opts().run_typestate {

src/comp/middle/unsafeck.rs renamed to src/comp/middle/fn_usage.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ import syntax::visit;
33
import std::option::some;
44
import syntax::print::pprust::{expr_to_str, path_to_str};
55

6-
export unsafeck_crate;
6+
export check_crate_fn_usage;
77

8-
type unsafe_ctx = {
8+
type fn_usage_ctx = {
99
tcx: ty::ctxt,
1010
unsafe_fn_legal: bool
1111
};
1212

13-
fn unsafeck_view_item(_vi: @ast::view_item,
14-
_ctx: unsafe_ctx,
15-
_v: visit::vt<unsafe_ctx>) {
13+
fn fn_usage_view_item(_vi: @ast::view_item,
14+
_ctx: fn_usage_ctx,
15+
_v: visit::vt<fn_usage_ctx>) {
1616
// Ignore paths that appear in use, import, etc
1717
}
1818

19-
fn unsafeck_expr(expr: @ast::expr,
20-
ctx: unsafe_ctx,
21-
v: visit::vt<unsafe_ctx>) {
19+
fn fn_usage_expr(expr: @ast::expr,
20+
ctx: fn_usage_ctx,
21+
v: visit::vt<fn_usage_ctx>) {
2222
alt expr.node {
2323
ast::expr_path(path) {
2424
if !ctx.unsafe_fn_legal {
@@ -51,11 +51,11 @@ fn unsafeck_expr(expr: @ast::expr,
5151
}
5252
}
5353

54-
fn unsafeck_crate(tcx: ty::ctxt, crate: @ast::crate) {
54+
fn check_crate_fn_usage(tcx: ty::ctxt, crate: @ast::crate) {
5555
let visit =
5656
visit::mk_vt(
57-
@{visit_expr: unsafeck_expr,
58-
visit_view_item: unsafeck_view_item
57+
@{visit_expr: fn_usage_expr,
58+
visit_view_item: fn_usage_view_item
5959
with *visit::default_visitor()});
6060
let ctx = {tcx: tcx, unsafe_fn_legal: false};
6161
visit::visit_crate(*crate, ctx, visit);

src/comp/rustc.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mod middle {
2525
mod ast_map;
2626
mod resolve;
2727
mod typeck;
28-
mod unsafeck;
28+
mod fn_usage;
2929
mod check_alt;
3030
mod mut;
3131
mod alias;

0 commit comments

Comments
 (0)