nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert FnCtxt methods from @mut self to &self

Browse Source
This commit is contained in:
Niko Matsakis 2013-02-26 14:40:24 -05:00
parent 4077d7b8b7
commit 824b9e7dbf
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/librustc/middle/typeck/check/mod.rs
View File

@ -649,9 +649,10 @@ impl AstConv for FnCtxt {
pub impl FnCtxt {
fn infcx(&self) -> @mut infer::InferCtxt { self.inh.infcx }
fn search_in_scope_regions(&self,
br: ty::bound_region)
-> Result<ty::Region, ~str> {
fn search_in_scope_regions(
&self,
br: ty::bound_region) -> Result<ty::Region, ~str>
{
let in_scope_regions = self.in_scope_regions;
match in_scope_regions.find(br) {
Some(r) => result::Ok(r),
@ -683,9 +684,9 @@ impl region_scope for FnCtxt {
}
pub impl FnCtxt {
fn tag(@mut self) -> ~str { fmt!("%x", ptr::addr_of(&(*self)) as uint) }
fn tag(&self) -> ~str { fmt!("%x", ptr::addr_of(&(*self)) as uint) }
fn local_ty(@mut self, span: span, nid: ast::node_id) -> ty::t {
fn local_ty(&self, span: span, nid: ast::node_id) -> ty::t {
match self.inh.locals.find(&nid) {
Some(t) => t,
None => {
@ -696,7 +697,7 @@ pub impl FnCtxt {
}
}
fn expr_to_str(@mut self, expr: @ast::expr) -> ~str {
fn expr_to_str(&self, expr: @ast::expr) -> ~str {
fmt!("expr(%?:%s)", expr.id,
pprust::expr_to_str(expr, self.tcx().sess.intr()))
}
@ -706,13 +707,13 @@ pub impl FnCtxt {
}
#[inline(always)]
fn write_ty(@mut self, node_id: ast::node_id, ty: ty::t) {
fn write_ty(&self, node_id: ast::node_id, ty: ty::t) {
debug!("write_ty(%d, %s) in fcx %s",
node_id, ppaux::ty_to_str(self.tcx(), ty), self.tag());
self.inh.node_types.insert(node_id, ty);
}
fn write_substs(@mut self, node_id: ast::node_id, +substs: ty::substs) {
fn write_substs(&self, node_id: ast::node_id, +substs: ty::substs) {
if !ty::substs_is_noop(&substs) {
debug!("write_substs(%d, %s) in fcx %s",
node_id,
@ -722,7 +723,7 @@ pub impl FnCtxt {
}
}
fn write_ty_substs(@mut self,
fn write_ty_substs(&self,
node_id: ast::node_id,
ty: ty::t,
+substs: ty::substs) {
@ -731,7 +732,7 @@ pub impl FnCtxt {
self.write_substs(node_id, substs);
}
fn write_autoderef_adjustment(@mut self,
fn write_autoderef_adjustment(&self,
node_id: ast::node_id,
derefs: uint) {
if derefs == 0 { return; }
@ -743,33 +744,33 @@ pub impl FnCtxt {
);
}
fn write_adjustment(@mut self,
fn write_adjustment(&self,
node_id: ast::node_id,
adj: @ty::AutoAdjustment) {
debug!("write_adjustment(node_id=%?, adj=%?)", node_id, adj);
self.inh.adjustments.insert(node_id, adj);
}
fn write_nil(@mut self, node_id: ast::node_id) {
fn write_nil(&self, node_id: ast::node_id) {
self.write_ty(node_id, ty::mk_nil(self.tcx()));
}
fn write_bot(@mut self, node_id: ast::node_id) {
fn write_bot(&self, node_id: ast::node_id) {
self.write_ty(node_id, ty::mk_bot(self.tcx()));
}
fn to_ty(@mut self, ast_t: @ast::Ty) -> ty::t {
fn to_ty(&self, ast_t: @ast::Ty) -> ty::t {
ast_ty_to_ty(self, self, ast_t)
}
fn expr_to_str(@mut self, expr: @ast::expr) -> ~str {
fn expr_to_str(&self, expr: @ast::expr) -> ~str {
expr_repr(self.tcx(), expr)
}
fn pat_to_str(@mut self, pat: @ast::pat) -> ~str {
fn pat_to_str(&self, pat: @ast::pat) -> ~str {
pat_repr(self.tcx(), pat)
}
fn expr_ty(@mut self, ex: @ast::expr) -> ty::t {
fn expr_ty(&self, ex: @ast::expr) -> ty::t {
match self.inh.node_types.find(&ex.id) {
Some(t) => t,
None => {
@ -779,7 +780,7 @@ pub impl FnCtxt {
}
}
}
fn node_ty(@mut self, id: ast::node_id) -> ty::t {
fn node_ty(&self, id: ast::node_id) -> ty::t {
match self.inh.node_types.find(&id) {
Some(t) => t,
None => {
@ -792,7 +793,7 @@ pub impl FnCtxt {
}
}
}
fn node_ty_substs(@mut self, id: ast::node_id) -> ty::substs {
fn node_ty_substs(&self, id: ast::node_id) -> ty::substs {
match self.inh.node_type_substs.find(&id) {
Some(ref ts) => (/*bad*/copy *ts),
None => {
@ -805,12 +806,12 @@ pub impl FnCtxt {
}
}
}
fn opt_node_ty_substs(@mut self, id: ast::node_id) -> Option<ty::substs> {
fn opt_node_ty_substs(&self, id: ast::node_id) -> Option<ty::substs> {
self.inh.node_type_substs.find(&id)
}
fn mk_subty(@mut self,
fn mk_subty(&self,
a_is_expected: bool,
span: span,
sub: ty::t,
@ -819,14 +820,14 @@ pub impl FnCtxt {
infer::mk_subty(self.infcx(), a_is_expected, span, sub, sup)
}
fn can_mk_subty(@mut self,
fn can_mk_subty(&self,
sub: ty::t,
sup: ty::t)
-> Result<(), ty::type_err> {
infer::can_mk_subty(self.infcx(), sub, sup)
}
fn mk_assignty(@mut self, expr: @ast::expr, sub: ty::t, sup: ty::t)
fn mk_assignty(&self, expr: @ast::expr, sub: ty::t, sup: ty::t)
-> Result<(), ty::type_err> {
match infer::mk_coercety(self.infcx(), false, expr.span, sub, sup) {
Ok(None) => result::Ok(()),
@ -838,14 +839,14 @@ pub impl FnCtxt {
}
}
fn can_mk_assignty(@mut self,
fn can_mk_assignty(&self,
sub: ty::t,
sup: ty::t)
-> Result<(), ty::type_err> {
infer::can_mk_coercety(self.infcx(), sub, sup)
}
fn mk_eqty(@mut self,
fn mk_eqty(&self,
a_is_expected: bool,
span: span,
sub: ty::t,
@ -854,7 +855,7 @@ pub impl FnCtxt {
infer::mk_eqty(self.infcx(), a_is_expected, span, sub, sup)
}
fn mk_subr(@mut self,
fn mk_subr(&self,
a_is_expected: bool,
span: span,
sub: ty::Region,
@ -863,7 +864,7 @@ pub impl FnCtxt {
infer::mk_subr(self.infcx(), a_is_expected, span, sub, sup)
}
fn require_unsafe(@mut self, sp: span, op: ~str) {
fn require_unsafe(&self, sp: span, op: ~str) {
match self.purity {
ast::unsafe_fn => {/*ok*/}
_ => {
@ -873,7 +874,8 @@ pub impl FnCtxt {
}
}
}
fn with_region_lb<R>(@mut self, lb: ast::node_id, f: fn() -> R) -> R {
fn with_region_lb<R>(@mut self, lb: ast::node_id, f: &fn() -> R) -> R {
let old_region_lb = self.region_lb;
self.region_lb = lb;
let v = f();
@ -881,7 +883,7 @@ pub impl FnCtxt {
v
}
fn region_var_if_parameterized(@mut self,
fn region_var_if_parameterized(&self,
rp: Option<ty::region_variance>,
span: span,
lower_bound: ty::Region)
@ -890,7 +892,7 @@ pub impl FnCtxt {
|_rp| self.infcx().next_region_var_with_lb(span, lower_bound))
}
fn type_error_message(@mut self,
fn type_error_message(&self,
sp: span,
mk_msg: &fn(~str) -> ~str,
actual_ty: ty::t,
@ -898,7 +900,7 @@ pub impl FnCtxt {
self.infcx().type_error_message(sp, mk_msg, actual_ty, err);
}
fn report_mismatched_return_types(@mut self,
fn report_mismatched_return_types(&self,
sp: span,
e: ty::t,
a: ty::t,
@ -919,12 +921,12 @@ pub impl FnCtxt {
}
}
fn report_mismatched_types(@mut self,
fn report_mismatched_types(&self,
sp: span,
e: ty::t,
a: ty::t,
err: &ty::type_err) {
self.infcx().report_mismatched_types(sp, e, a, err)
self.infcx().report_mismatched_types(sp, e, a, err)
}
}