From: bors <bors@rust-lang.org>
Date: Tue, 9 Jul 2019 22:02:58 +0000 (+0000)
Subject: Auto merge of #62542 - Centril:rollup-5mpb8tu, r=Centril
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=e7efdf1c33c699def0e594f03337efc78120bd9c;hp=-c;p=rust.git

Auto merge of #62542 - Centril:rollup-5mpb8tu, r=Centril

Rollup of 9 pull requests

Successful merges:

 - #62417 (Fix ICEs when `Self` is used in type aliases)
 - #62450 (Raise the default recursion limit to 128)
 - #62470 (Prevent shrinking of "crate select" element on Firefox)
 - #62515 (cli: make help output for -l and -L consistent)
 - #62520 (Regression test for issue 42574.)
 - #62526 (normalize use of backticks in compiler messages for libsyntax/feature_gate.rs)
 - #62527 (clarify that debug_assert does not completely omits the code)
 - #62535 (ci: Configure $CI_JOB_NAME correctly)
 - #62541 (Add spastorino for rustc-guide toolstate)

Failed merges:

r? @ghost
---

e7efdf1c33c699def0e594f03337efc78120bd9c
diff --combined src/librustc_typeck/check/mod.rs
index e192465588e,d8c73b2be82..4acba6d38fa
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@@ -1065,7 -1065,6 +1065,7 @@@ fn check_fn<'a, 'tcx>
          &declared_ret_ty,
          decl.output.span(),
      );
 +    debug!("check_fn: declared_ret_ty: {}, revealed_ret_ty: {}", declared_ret_ty, revealed_ret_ty);
      fcx.ret_coercion = Some(RefCell::new(CoerceMany::new(revealed_ret_ty)));
      fn_sig = fcx.tcx.mk_fn_sig(
          fn_sig.inputs().iter().cloned(),
@@@ -4458,7 -4457,7 +4458,7 @@@ pub fn check_bounds_are_used<'tcx>(tcx
          return;
      }
  
-     // Make a vector of booleans initially false, set to true when used.
+     // Make a vector of booleans initially `false`; set to `true` when used.
      let mut types_used = vec![false; own_counts.types];
  
      for leaf_ty in ty.walk() {
@@@ -4467,7 -4466,7 +4467,7 @@@
              types_used[index as usize - own_counts.lifetimes] = true;
          } else if let ty::Error = leaf_ty.sty {
              // If there is already another error, do not emit
-             // an error for not using a type Parameter.
+             // an error for not using a type parameter.
              assert!(tcx.sess.has_errors());
              return;
          }