bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #84987 - lcnr:nits, r=Mark-Simulacrum

Browse source 
small nits
This commit is contained in:
Dylan DPC 2021-05-07 00:38:45 +02:00 • committed by GitHub
commit 01e9d09d3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -2398,9 +2398,6 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
self.tcx.associated_item(def_id).ident self.tcx.associated_item(def_id).ident
), ),
infer::EarlyBoundRegion(_, name) => format!(" for lifetime parameter `{}`", name), infer::EarlyBoundRegion(_, name) => format!(" for lifetime parameter `{}`", name),
infer::BoundRegionInCoherence(name) => {
format!(" for lifetime parameter `{}` in coherence check", name)
}
infer::UpvarRegion(ref upvar_id, _) => { infer::UpvarRegion(ref upvar_id, _) => {
let var_name = self.tcx.hir().name(upvar_id.var_path.hir_id); let var_name = self.tcx.hir().name(upvar_id.var_path.hir_id);
format!(" for capture of `{}` by closure", var_name) format!(" for capture of `{}` by closure", var_name)

3
compiler/rustc_infer/src/infer/mod.rs
View file

@ -453,8 +453,6 @@ pub enum RegionVariableOrigin {
UpvarRegion(ty::UpvarId, Span), UpvarRegion(ty::UpvarId, Span),
BoundRegionInCoherence(Symbol),
/// This origin is used for the inference variables that we create /// This origin is used for the inference variables that we create
/// during NLL region processing. /// during NLL region processing.
Nll(NllRegionVariableOrigin), Nll(NllRegionVariableOrigin),
@ -1749,7 +1747,6 @@ impl RegionVariableOrigin {
| EarlyBoundRegion(a, ..) | EarlyBoundRegion(a, ..)
| LateBoundRegion(a, ..) | LateBoundRegion(a, ..)
| UpvarRegion(_, a) => a, | UpvarRegion(_, a) => a,
BoundRegionInCoherence(_) => rustc_span::DUMMY_SP,
Nll(..) => bug!("NLL variable used with `span`"), Nll(..) => bug!("NLL variable used with `span`"),
} }
} }

2
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -1044,8 +1044,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
} }
/// Returns `true` if the global caches can be used. /// Returns `true` if the global caches can be used.
/// Do note that if the type itself is not in the
/// global tcx, the local caches will be used.
fn can_use_global_caches(&self, param_env: ty::ParamEnv<'tcx>) -> bool { fn can_use_global_caches(&self, param_env: ty::ParamEnv<'tcx>) -> bool {
// If there are any inference variables in the `ParamEnv`, then we // If there are any inference variables in the `ParamEnv`, then we
// always use a cache local to this particular scope. Otherwise, we // always use a cache local to this particular scope. Otherwise, we