Skip to content

Commit 3fb1ed0

Browse files
committed
rustc: Remove all usage of manual deref()
Favor using '*' instead
1 parent 76f0b1a commit 3fb1ed0

File tree

27 files changed

+61
-68
lines changed

27 files changed

+61
-68
lines changed

src/librustc/driver/driver.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,8 @@ fn write_out_deps(sess: &Session,
543543
// write Makefile-compatible dependency rules
544544
let files: Vec<~str> = sess.codemap().files.borrow()
545545
.iter().filter_map(|fmap| {
546-
if fmap.deref().is_real_file() {
547-
Some(fmap.deref().name.clone())
546+
if fmap.is_real_file() {
547+
Some(fmap.name.clone())
548548
} else {
549549
None
550550
}
@@ -682,7 +682,7 @@ pub fn pretty_print_input(sess: Session,
682682
};
683683

684684
let src_name = source_name(input);
685-
let src = sess.codemap().get_filemap(src_name).deref().src.as_bytes().to_owned();
685+
let src = sess.codemap().get_filemap(src_name).src.as_bytes().to_owned();
686686
let mut rdr = MemReader::new(src);
687687

688688
match ppm {

src/librustc/middle/astencode.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,8 +1045,7 @@ fn encode_side_tables_for_id(ecx: &e::EncodeContext,
10451045
ebml_w.tag(c::tag_table_capture_map, |ebml_w| {
10461046
ebml_w.id(id);
10471047
ebml_w.tag(c::tag_table_val, |ebml_w| {
1048-
ebml_w.emit_from_vec(cap_vars.deref().as_slice(),
1049-
|ebml_w, cap_var| {
1048+
ebml_w.emit_from_vec(cap_vars.as_slice(), |ebml_w, cap_var| {
10501049
cap_var.encode(ebml_w);
10511050
})
10521051
})

src/librustc/middle/borrowck/check_loans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ impl<'a> CheckLoanCtxt<'a> {
710710
fn check_captured_variables(&self,
711711
closure_id: ast::NodeId,
712712
span: Span) {
713-
for cap_var in self.bccx.capture_map.get(&closure_id).deref().iter() {
713+
for cap_var in self.bccx.capture_map.get(&closure_id).iter() {
714714
let var_id = ast_util::def_id_of_def(cap_var.def).node;
715715
let var_path = @LpVar(var_id);
716716
self.check_if_path_is_moved(closure_id, span,

src/librustc/middle/borrowck/gather_loans/gather_moves.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub fn gather_move_from_pat(bccx: &BorrowckCtxt,
4747
pub fn gather_captures(bccx: &BorrowckCtxt,
4848
move_data: &MoveData,
4949
closure_expr: &ast::Expr) {
50-
for captured_var in bccx.capture_map.get(&closure_expr.id).deref().iter() {
50+
for captured_var in bccx.capture_map.get(&closure_expr.id).iter() {
5151
match captured_var.mode {
5252
moves::CapMove => {
5353
let cmt = bccx.cat_captured_var(closure_expr.id,

src/librustc/middle/borrowck/gather_loans/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ impl<'a> GatherLoanCtxt<'a> {
452452

453453
fn guarantee_captures(&mut self,
454454
closure_expr: &ast::Expr) {
455-
for captured_var in self.bccx.capture_map.get(&closure_expr.id).deref().iter() {
455+
for captured_var in self.bccx.capture_map.get(&closure_expr.id).iter() {
456456
match captured_var.mode {
457457
moves::CapCopy | moves::CapMove => { continue; }
458458
moves::CapRef => { }

src/librustc/middle/const_eval.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ pub fn lit_to_const(lit: &Lit) -> const_val {
490490
match lit.node {
491491
LitStr(ref s, _) => const_str((*s).clone()),
492492
LitBinary(ref data) => {
493-
const_binary(Rc::new(data.deref().iter().map(|x| *x).collect()))
493+
const_binary(Rc::new(data.iter().map(|x| *x).collect()))
494494
}
495495
LitChar(n) => const_uint(n as u64),
496496
LitInt(n, _) => const_int(n),

src/librustc/middle/kind.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ pub fn check_expr(cx: &mut Context, e: &Expr) {
291291
}
292292
}
293293
};
294-
let type_param_defs = type_param_defs.deref();
295294
if ts.len() != type_param_defs.len() {
296295
// Fail earlier to make debugging easier
297296
fail!("internal error: in kind::check_expr, length \

src/librustc/middle/liveness.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ fn visit_expr(ir: &mut IrMaps, expr: &Expr) {
472472
// in better error messages than just pointing at the closure
473473
// construction site.
474474
let mut call_caps = Vec::new();
475-
for cv in ir.capture_map.get(&expr.id).deref().iter() {
475+
for cv in ir.capture_map.get(&expr.id).iter() {
476476
match moves::moved_variable_node_id_from_def(cv.def) {
477477
Some(rv) => {
478478
let cv_ln = ir.add_live_node(FreeVarNode(cv.span));
@@ -979,7 +979,7 @@ impl<'a> Liveness<'a> {
979979
this.ir.tcx.sess.span_bug(expr.span, "no registered caps");
980980
}
981981
};
982-
caps.deref().iter().rev().fold(succ, |succ, cap| {
982+
caps.iter().rev().fold(succ, |succ, cap| {
983983
this.init_from_succ(cap.ln, succ);
984984
let var = this.variable(cap.var_nid, expr.span);
985985
this.acc(cap.ln, var, ACC_READ | ACC_USE);

src/librustc/middle/subst.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ impl<T:Subst> Subst for Rc<T> {
141141
fn subst_spanned(&self, tcx: &ty::ctxt,
142142
substs: &ty::substs,
143143
span: Option<Span>) -> Rc<T> {
144-
Rc::new(self.deref().subst_spanned(tcx, substs, span))
144+
Rc::new((**self).subst_spanned(tcx, substs, span))
145145
}
146146
}
147147

src/librustc/middle/trans/closure.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,11 +394,11 @@ pub fn trans_expr_fn<'a>(
394394

395395
let cap_vars = ccx.maps.capture_map.borrow().get_copy(&id);
396396
let ClosureResult {llbox, cdata_ty, bcx} =
397-
build_closure(bcx, cap_vars.deref().as_slice(), sigil);
397+
build_closure(bcx, cap_vars.as_slice(), sigil);
398398
trans_closure(ccx, decl, body, llfn,
399399
bcx.fcx.param_substs, id,
400400
[], ty::ty_fn_ret(fty),
401-
|bcx| load_environment(bcx, cdata_ty, cap_vars.deref().as_slice(), sigil));
401+
|bcx| load_environment(bcx, cdata_ty, cap_vars.as_slice(), sigil));
402402
fill_fn_pair(bcx, dest_addr, llfn, llbox);
403403

404404
bcx

src/librustc/middle/trans/common.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ pub fn filename_and_line_num_from_span(bcx: &Block, span: Span)
937937
-> (ValueRef, ValueRef) {
938938
let loc = bcx.sess().codemap().lookup_char_pos(span.lo);
939939
let filename_cstr = C_cstr(bcx.ccx(),
940-
token::intern_and_get_ident(loc.file.deref().name));
940+
token::intern_and_get_ident(loc.file.name));
941941
let filename = build::PointerCast(bcx, filename_cstr, Type::i8p(bcx.ccx()));
942942
let line = C_int(bcx.ccx(), loc.line as int);
943943
(filename, line)

src/librustc/middle/trans/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pub fn const_lit(cx: &CrateContext, e: &ast::Expr, lit: ast::Lit)
7777
ast::LitBool(b) => C_bool(cx, b),
7878
ast::LitNil => C_nil(cx),
7979
ast::LitStr(ref s, _) => C_str_slice(cx, (*s).clone()),
80-
ast::LitBinary(ref data) => C_binary_slice(cx, data.deref().as_slice()),
80+
ast::LitBinary(ref data) => C_binary_slice(cx, data.as_slice()),
8181
}
8282
}
8383

src/librustc/middle/trans/controlflow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ pub fn trans_fail<'a>(
334334
let v_fail_str = C_cstr(ccx, fail_str);
335335
let _icx = push_ctxt("trans_fail_value");
336336
let loc = bcx.sess().codemap().lookup_char_pos(sp.lo);
337-
let v_filename = C_cstr(ccx, token::intern_and_get_ident(loc.file.deref().name));
337+
let v_filename = C_cstr(ccx, token::intern_and_get_ident(loc.file.name));
338338
let v_line = loc.line as int;
339339
let v_str = PointerCast(bcx, v_fail_str, Type::i8p(ccx));
340340
let v_filename = PointerCast(bcx, v_filename, Type::i8p(ccx));

src/librustc/middle/trans/debuginfo.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ pub fn create_function_debug_context(cx: &CrateContext,
610610
}
611611

612612
let loc = span_start(cx, span);
613-
let file_metadata = file_metadata(cx, loc.file.deref().name);
613+
let file_metadata = file_metadata(cx, loc.file.name);
614614

615615
let function_type_metadata = unsafe {
616616
let fn_signature = get_function_signature(cx, fn_ast_id, fn_decl, param_substs, span);
@@ -930,7 +930,7 @@ fn declare_local(bcx: &Block,
930930
span: Span) {
931931
let cx: &CrateContext = bcx.ccx();
932932

933-
let filename = span_start(cx, span).file.deref().name.clone();
933+
let filename = span_start(cx, span).file.name.clone();
934934
let file_metadata = file_metadata(cx, filename);
935935

936936
let name = token::get_ident(variable_ident);
@@ -1181,7 +1181,7 @@ fn prepare_struct_metadata(cx: &CrateContext,
11811181

11821182
let (containing_scope, definition_span) = get_namespace_and_span_for_item(cx, def_id);
11831183

1184-
let file_name = span_start(cx, definition_span).file.deref().name.clone();
1184+
let file_name = span_start(cx, definition_span).file.name.clone();
11851185
let file_metadata = file_metadata(cx, file_name);
11861186

11871187
let struct_metadata_stub = create_struct_stub(cx,
@@ -1276,7 +1276,7 @@ fn prepare_tuple_metadata(cx: &CrateContext,
12761276
let tuple_llvm_type = type_of::type_of(cx, tuple_type);
12771277

12781278
let loc = span_start(cx, span);
1279-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1279+
let file_metadata = file_metadata(cx, loc.file.name);
12801280

12811281
UnfinishedMetadata {
12821282
cache_id: cache_id_for_type(tuple_type),
@@ -1436,7 +1436,7 @@ fn prepare_enum_metadata(cx: &CrateContext,
14361436

14371437
let (containing_scope, definition_span) = get_namespace_and_span_for_item(cx, enum_def_id);
14381438
let loc = span_start(cx, definition_span);
1439-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1439+
let file_metadata = file_metadata(cx, loc.file.name);
14401440

14411441
// For empty enums there is an early exit. Just describe it as an empty struct with the
14421442
// appropriate type name
@@ -1775,7 +1775,7 @@ fn boxed_type_metadata(cx: &CrateContext,
17751775
];
17761776

17771777
let loc = span_start(cx, span);
1778-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1778+
let file_metadata = file_metadata(cx, loc.file.name);
17791779

17801780
return composite_type_metadata(
17811781
cx,
@@ -1876,7 +1876,7 @@ fn vec_metadata(cx: &CrateContext,
18761876
assert!(member_descriptions.len() == member_llvm_types.len());
18771877

18781878
let loc = span_start(cx, span);
1879-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1879+
let file_metadata = file_metadata(cx, loc.file.name);
18801880

18811881
composite_type_metadata(
18821882
cx,
@@ -1927,7 +1927,7 @@ fn vec_slice_metadata(cx: &CrateContext,
19271927
assert!(member_descriptions.len() == member_llvm_types.len());
19281928

19291929
let loc = span_start(cx, span);
1930-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1930+
let file_metadata = file_metadata(cx, loc.file.name);
19311931

19321932
return composite_type_metadata(
19331933
cx,
@@ -1953,7 +1953,7 @@ fn subroutine_type_metadata(cx: &CrateContext,
19531953
span: Span)
19541954
-> DICompositeType {
19551955
let loc = span_start(cx, span);
1956-
let file_metadata = file_metadata(cx, loc.file.deref().name);
1956+
let file_metadata = file_metadata(cx, loc.file.name);
19571957

19581958
let mut signature_metadata: Vec<DIType> =
19591959
Vec::with_capacity(signature.inputs.len() + 1);
@@ -1999,7 +1999,7 @@ fn trait_metadata(cx: &CrateContext,
19991999

20002000
let (containing_scope, definition_span) = get_namespace_and_span_for_item(cx, def_id);
20012001

2002-
let file_name = span_start(cx, definition_span).file.deref().name.clone();
2002+
let file_name = span_start(cx, definition_span).file.name.clone();
20032003
let file_metadata = file_metadata(cx, file_name);
20042004

20052005
let trait_llvm_type = type_of::type_of(cx, trait_type);
@@ -2297,7 +2297,7 @@ fn populate_scope_map(cx: &CrateContext,
22972297
&mut HashMap<ast::NodeId, DIScope>|) {
22982298
// Create a new lexical scope and push it onto the stack
22992299
let loc = cx.sess().codemap().lookup_char_pos(scope_span.lo);
2300-
let file_metadata = file_metadata(cx, loc.file.deref().name);
2300+
let file_metadata = file_metadata(cx, loc.file.name);
23012301
let parent_scope = scope_stack.last().unwrap().scope_metadata;
23022302

23032303
let scope_metadata = unsafe {
@@ -2414,7 +2414,7 @@ fn populate_scope_map(cx: &CrateContext,
24142414
if need_new_scope {
24152415
// Create a new lexical scope and push it onto the stack
24162416
let loc = cx.sess().codemap().lookup_char_pos(pat.span.lo);
2417-
let file_metadata = file_metadata(cx, loc.file.deref().name);
2417+
let file_metadata = file_metadata(cx, loc.file.name);
24182418
let parent_scope = scope_stack.last().unwrap().scope_metadata;
24192419

24202420
let scope_metadata = unsafe {

src/librustc/middle/ty.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,13 +1009,13 @@ pub struct Generics {
10091009

10101010
impl Generics {
10111011
pub fn has_type_params(&self) -> bool {
1012-
!self.type_param_defs.deref().is_empty()
1012+
!self.type_param_defs.is_empty()
10131013
}
10141014
pub fn type_param_defs<'a>(&'a self) -> &'a [TypeParameterDef] {
1015-
self.type_param_defs.deref().as_slice()
1015+
self.type_param_defs.as_slice()
10161016
}
10171017
pub fn region_param_defs<'a>(&'a self) -> &'a [RegionParameterDef] {
1018-
self.region_param_defs.deref().as_slice()
1018+
self.region_param_defs.as_slice()
10191019
}
10201020
}
10211021

src/librustc/middle/typeck/check/method.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ impl<'a> LookupContext<'a> {
11101110
let m_regions =
11111111
self.fcx.infcx().region_vars_for_defs(
11121112
self.span,
1113-
candidate.method_ty.generics.region_param_defs.deref().as_slice());
1113+
candidate.method_ty.generics.region_param_defs.as_slice());
11141114
for &r in m_regions.iter() {
11151115
all_regions.push(r);
11161116
}

src/librustc/middle/typeck/check/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ pub fn check_item(ccx: &CrateCtxt, it: &ast::Item) {
565565
fn_tpt.generics.type_param_defs(),
566566
[],
567567
[],
568-
fn_tpt.generics.region_param_defs.deref().as_slice(),
568+
fn_tpt.generics.region_param_defs.as_slice(),
569569
body.id);
570570

571571
check_bare_fn(ccx, decl, body, it.id, fn_tpt.ty, param_env);
@@ -3698,7 +3698,7 @@ pub fn instantiate_path(fcx: &FnCtxt,
36983698
nsupplied = num_supplied_regions));
36993699
}
37003700

3701-
fcx.infcx().region_vars_for_defs(span, tpt.generics.region_param_defs.deref().as_slice())
3701+
fcx.infcx().region_vars_for_defs(span, tpt.generics.region_param_defs.as_slice())
37023702
};
37033703
let regions = ty::NonerasedRegions(regions);
37043704

src/librustc/middle/typeck/check/vtable.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,12 +666,11 @@ pub fn early_resolve_expr(ex: &ast::Expr, fcx: &FnCtxt, is_early: bool) {
666666
debug!("vtable resolution on parameter bounds for method call {}",
667667
ex.repr(fcx.tcx()));
668668
let type_param_defs = ty::method_call_type_param_defs(cx.tcx, method.origin);
669-
if has_trait_bounds(type_param_defs.deref().as_slice()) {
669+
if has_trait_bounds(type_param_defs.as_slice()) {
670670
let substs = fcx.method_ty_substs(ex.id);
671671
let vcx = fcx.vtable_context();
672672
let vtbls = lookup_vtables(&vcx, ex.span,
673-
type_param_defs.deref()
674-
.as_slice(),
673+
type_param_defs.as_slice(),
675674
&substs, is_early);
676675
if !is_early {
677676
insert_vtables(fcx, ex.id, vtbls);
@@ -780,7 +779,7 @@ pub fn resolve_impl(tcx: &ty::ctxt,
780779
pub fn trans_resolve_method(tcx: &ty::ctxt, id: ast::NodeId,
781780
substs: &ty::substs) -> Option<vtable_res> {
782781
let generics = ty::lookup_item_type(tcx, ast_util::local_def(id)).generics;
783-
let type_param_defs = generics.type_param_defs.deref();
782+
let type_param_defs = &*generics.type_param_defs;
784783
if has_trait_bounds(type_param_defs.as_slice()) {
785784
let vcx = VtableContext {
786785
infcx: &infer::new_infer_ctxt(tcx),

src/librustc/middle/typeck/collect.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,7 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt, trait_id: ast::NodeId) {
338338
let mut new_type_param_defs = Vec::new();
339339
let substd_type_param_defs =
340340
trait_ty_generics.type_param_defs.subst(tcx, &substs);
341-
new_type_param_defs.push_all(substd_type_param_defs.deref()
342-
.as_slice());
341+
new_type_param_defs.push_all(substd_type_param_defs.as_slice());
343342

344343
// add in the "self" type parameter
345344
let self_trait_def = get_trait_def(ccx, local_def(trait_id));
@@ -356,8 +355,7 @@ pub fn ensure_trait_methods(ccx: &CrateCtxt, trait_id: ast::NodeId) {
356355

357356
// add in the type parameters from the method
358357
let substd_type_param_defs = m.generics.type_param_defs.subst(tcx, &substs);
359-
new_type_param_defs.push_all(substd_type_param_defs.deref()
360-
.as_slice());
358+
new_type_param_defs.push_all(substd_type_param_defs.as_slice());
361359

362360
debug!("static method {} type_param_defs={} ty={}, substs={}",
363361
m.def_id.repr(tcx),

src/librustdoc/clean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ impl ToSource for syntax::codemap::Span {
11811181
fn lit_to_str(lit: &ast::Lit) -> ~str {
11821182
match lit.node {
11831183
ast::LitStr(ref st, _) => st.get().to_owned(),
1184-
ast::LitBinary(ref data) => format!("{:?}", data.deref().as_slice()),
1184+
ast::LitBinary(ref data) => format!("{:?}", data.as_slice()),
11851185
ast::LitChar(c) => ~"'" + std::char::from_u32(c).unwrap().to_str() + "'",
11861186
ast::LitInt(i, _t) => i.to_str(),
11871187
ast::LitUint(u, _t) => u.to_str(),

src/librustuv/idle.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ mod test {
113113
fn call(&mut self) {
114114
let task = match *self {
115115
MyCallback(ref rc, n) => {
116-
let mut slot = rc.deref().borrow_mut();
116+
let mut slot = rc.borrow_mut();
117117
match *slot.get() {
118118
(ref mut task, ref mut val) => {
119119
*val = n;
@@ -140,7 +140,7 @@ mod test {
140140
fn sleep(chan: &Chan) -> uint {
141141
let task: ~Task = Local::take();
142142
task.deschedule(1, |task| {
143-
let mut slot = chan.deref().borrow_mut();
143+
let mut slot = chan.borrow_mut();
144144
match *slot.get() {
145145
(ref mut slot, _) => {
146146
assert!(slot.is_none());
@@ -150,7 +150,7 @@ mod test {
150150
Ok(())
151151
});
152152

153-
let slot = chan.deref().borrow();
153+
let slot = chan.borrow();
154154
match *slot.get() { (_, n) => n }
155155
}
156156

src/libserialize/serialize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ impl<S:Encoder,T:Encodable<S>> Encodable<S> for @T {
387387
impl<S:Encoder,T:Encodable<S>> Encodable<S> for Rc<T> {
388388
#[inline]
389389
fn encode(&self, s: &mut S) {
390-
self.deref().encode(s)
390+
(**self).encode(s)
391391
}
392392
}
393393

src/libstd/hash/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
use container::Container;
6767
use io::Writer;
6868
use iter::Iterator;
69-
use ops::Deref;
7069
use option::{Option, Some, None};
7170
use rc::Rc;
7271
use str::{Str, StrSlice};
@@ -247,7 +246,7 @@ impl<S: Writer, T: Hash<S>> Hash<S> for @T {
247246
impl<S: Writer, T: Hash<S>> Hash<S> for Rc<T> {
248247
#[inline]
249248
fn hash(&self, state: &mut S) {
250-
self.deref().hash(state);
249+
(**self).hash(state);
251250
}
252251
}
253252

0 commit comments

Comments
 (0)