Skip to content

Commit 770e106

Browse files
---
yaml --- r: 274830 b: refs/heads/stable c: 93e58cc h: refs/heads/master
1 parent faa9f09 commit 770e106

28 files changed

+264
-265
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: f831d98ba2167ac19966618bfb218856e1eedc63
32+
refs/heads/stable: 93e58cc28fdc978cbc967b131a7ec04bc2a90bb1
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_trans/back/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ fn link_natively(sess: &Session, dylib: bool,
916916
pname,
917917
prog.status))
918918
.note(&format!("{:?}", &cmd))
919-
.note(&*escape_string(&output[..]))
919+
.note(&escape_string(&output[..]))
920920
.emit();
921921
sess.abort_if_errors();
922922
}

branches/stable/src/librustc_trans/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ unsafe extern "C" fn diagnostic_handler(info: DiagnosticInfoRef, user: *mut c_vo
380380
match llvm::diagnostic::Diagnostic::unpack(info) {
381381
llvm::diagnostic::InlineAsm(inline) => {
382382
report_inline_asm(cgcx,
383-
&*llvm::twine_to_string(inline.message),
383+
&llvm::twine_to_string(inline.message),
384384
inline.cookie);
385385
}
386386

branches/stable/src/librustc_trans/save/dump_csv.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
468468
&name.as_str(),
469469
&qualname,
470470
&self.span.snippet(expr.span),
471-
&ty_to_string(&*typ),
471+
&ty_to_string(&typ),
472472
self.cur_scope);
473473

474474
// walk type and init value
@@ -550,7 +550,7 @@ impl <'l, 'tcx> DumpCsvVisitor<'l, 'tcx> {
550550

551551
for field in variant.node.data.fields() {
552552
self.process_struct_field_def(field, variant.node.data.id());
553-
self.visit_ty(&*field.node.ty);
553+
self.visit_ty(&field.node.ty);
554554
}
555555
}
556556
self.process_generic_params(ty_params, item.span, &enum_data.qualname, enum_data.id);
@@ -970,7 +970,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
970970
self.cur_scope);
971971
}
972972
Fn(ref decl, _, _, _, ref ty_params, ref body) =>
973-
self.process_fn(item, &**decl, ty_params, &**body),
973+
self.process_fn(item, &decl, ty_params, &body),
974974
Static(ref typ, _, ref expr) =>
975975
self.process_static_or_const_item(item, typ, expr),
976976
Const(ref typ, ref expr) =>
@@ -992,11 +992,11 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
992992
}
993993
Ty(ref ty, ref ty_params) => {
994994
let qualname = format!("::{}", self.tcx.map.path_to_string(item.id));
995-
let value = ty_to_string(&**ty);
995+
let value = ty_to_string(&ty);
996996
let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Type);
997997
self.fmt.typedef_str(item.span, sub_span, item.id, &qualname, &value);
998998

999-
self.visit_ty(&**ty);
999+
self.visit_ty(&ty);
10001000
self.process_generic_params(ty_params, item.span, &qualname, item.id);
10011001
}
10021002
Mac(_) => (),
@@ -1012,7 +1012,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
10121012
}
10131013
}
10141014
if let Some(ref ty) = param.default {
1015-
self.visit_ty(&**ty);
1015+
self.visit_ty(&ty);
10161016
}
10171017
}
10181018
}
@@ -1024,8 +1024,8 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
10241024
self.process_const(trait_item.id,
10251025
trait_item.ident.name,
10261026
trait_item.span,
1027-
&*ty,
1028-
&*expr);
1027+
&ty,
1028+
&expr);
10291029
}
10301030
ast::TraitItemKind::Method(ref sig, ref body) => {
10311031
self.process_method(sig,
@@ -1113,7 +1113,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
11131113
}
11141114
}
11151115
ast::ExprKind::TupField(ref sub_ex, idx) => {
1116-
self.visit_expr(&**sub_ex);
1116+
self.visit_expr(&sub_ex);
11171117

11181118
let hir_node = lower_expr(self.save_ctxt.lcx, sub_ex);
11191119
let ty = &self.tcx.expr_ty_adjusted(&hir_node).sty;
@@ -1139,15 +1139,15 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DumpCsvVisitor<'l, 'tcx> {
11391139

11401140
// walk arg and return types
11411141
for arg in &decl.inputs {
1142-
self.visit_ty(&*arg.ty);
1142+
self.visit_ty(&arg.ty);
11431143
}
11441144

11451145
if let ast::FunctionRetTy::Ty(ref ret_ty) = decl.output {
1146-
self.visit_ty(&**ret_ty);
1146+
self.visit_ty(&ret_ty);
11471147
}
11481148

11491149
// walk the body
1150-
self.nest(ex.id, |v| v.visit_block(&**body));
1150+
self.nest(ex.id, |v| v.visit_block(&body));
11511151
}
11521152
ast::ExprKind::ForLoop(ref pattern, ref subexpression, ref block, _) |
11531153
ast::ExprKind::WhileLet(ref pattern, ref subexpression, ref block, _) => {

branches/stable/src/librustc_trans/save/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> {
389389
match item.node {
390390
hir::ItemImpl(_, _, _, _, ref ty, _) => {
391391
let mut result = String::from("<");
392-
result.push_str(&rustc_front::print::pprust::ty_to_string(&**ty));
392+
result.push_str(&rustc_front::print::pprust::ty_to_string(&ty));
393393

394394
match self.tcx.trait_of_item(self.tcx.map.local_def_id(id)) {
395395
Some(def_id) => {

0 commit comments

Comments
 (0)