nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-04 19:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cosmetic changes

Browse Source
This commit is contained in:
Alexander Regueiro 2018-12-26 16:15:42 +00:00
parent 87532e99e5
commit ab239f37aa
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_typeck/check/_match.rs
View File

@ -275,7 +275,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
PatKind::Tuple(ref elements, ddpos) => { PatKind::Tuple(ref elements, ddpos) => {
let mut expected_len = elements.len(); let mut expected_len = elements.len();
if ddpos.is_some() { if ddpos.is_some() {
// Require known type only when `..` is present // Require known type only when `..` is present.
if let ty::Tuple(ref tys) = if let ty::Tuple(ref tys) =
self.structurally_resolved_type(pat.span, expected).sty { self.structurally_resolved_type(pat.span, expected).sty {
expected_len = tys.len(); expected_len = tys.len();
@ -284,8 +284,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
let max_len = cmp::max(expected_len, elements.len()); let max_len = cmp::max(expected_len, elements.len());
let element_tys_iter = (0..max_len).map(|_| self.next_ty_var( let element_tys_iter = (0..max_len).map(|_| self.next_ty_var(
// FIXME: MiscVariable for now, obtaining the span and name information // FIXME: `MiscVariable` for now -- obtaining the span and name information
// from all tuple elements isn't trivial. // from all tuple elements isn't trivial.
TypeVariableOrigin::TypeInference(pat.span))); TypeVariableOrigin::TypeInference(pat.span)));
let element_tys = tcx.mk_type_list(element_tys_iter); let element_tys = tcx.mk_type_list(element_tys_iter);
let pat_ty = tcx.mk_ty(ty::Tuple(element_tys)); let pat_ty = tcx.mk_ty(ty::Tuple(element_tys));

13
src/librustc_typeck/check/mod.rs
View File

@ -4615,7 +4615,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
local: &'gcx hir::Local, local: &'gcx hir::Local,
init: &'gcx hir::Expr) -> Ty<'tcx> init: &'gcx hir::Expr) -> Ty<'tcx>
{ {
// FIXME(tschottdorf): contains_explicit_ref_binding() must be removed // FIXME(tschottdorf): `contains_explicit_ref_binding()` must be removed
// for #42640 (default match binding modes). // for #42640 (default match binding modes).
// //
// See #44848. // See #44848.
@ -4660,7 +4660,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} }
pub fn check_stmt(&self, stmt: &'gcx hir::Stmt) { pub fn check_stmt(&self, stmt: &'gcx hir::Stmt) {
// Don't do all the complex logic below for DeclItem. // Don't do all the complex logic below for `DeclItem`.
match stmt.node { match stmt.node {
hir::StmtKind::Decl(ref decl, _) => { hir::StmtKind::Decl(ref decl, _) => {
if let hir::DeclKind::Item(_) = decl.node { if let hir::DeclKind::Item(_) = decl.node {
@ -4672,7 +4672,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
self.warn_if_unreachable(stmt.node.id(), stmt.span, "statement"); self.warn_if_unreachable(stmt.node.id(), stmt.span, "statement");
// Hide the outer diverging and has_errors flags. // Hide the outer diverging and `has_errors` flags.
let old_diverges = self.diverges.get(); let old_diverges = self.diverges.get();
let old_has_errors = self.has_errors.get(); let old_has_errors = self.has_errors.get();
self.diverges.set(Diverges::Maybe); self.diverges.set(Diverges::Maybe);
@ -4684,11 +4684,12 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
hir::DeclKind::Local(ref l) => { hir::DeclKind::Local(ref l) => {
self.check_decl_local(&l); self.check_decl_local(&l);
} }
hir::DeclKind::Item(_) => {/* ignore for now */} // Ignore for now.
hir::DeclKind::Item(_) => ()
} }
} }
hir::StmtKind::Expr(ref expr, _) => { hir::StmtKind::Expr(ref expr, _) => {
// Check with expected type of () // Check with expected type of `()`.
self.check_expr_has_type_or_error(&expr, self.tcx.mk_unit()); self.check_expr_has_type_or_error(&expr, self.tcx.mk_unit());
} }
hir::StmtKind::Semi(ref expr, _) => { hir::StmtKind::Semi(ref expr, _) => {
@ -4696,7 +4697,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
} }
} }
// Combine the diverging and has_error flags. // Combine the diverging and `has_error` flags.
self.diverges.set(self.diverges.get() | old_diverges); self.diverges.set(self.diverges.get() | old_diverges);
self.has_errors.set(self.has_errors.get() | old_has_errors); self.has_errors.set(self.has_errors.get() | old_has_errors);
} }