Skip to content

Commit 6b2a824

Browse files
compiler-errorscompiler-errors
committed
Remove dead args from functions
1 parent 11f32b7 commit 6b2a824

File tree

22 files changed

+32
-124
lines changed

22 files changed

+32
-124
lines changed

‎compiler/rustc_borrowck/src/nll.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub(crate) fn compute_regions<'cx, 'tcx>(
184184

185185
// Solve the region constraints.
186186
let (closure_region_requirements, nll_errors) =
187-
regioncx.solve(infcx, param_env, body, polonius_output.clone());
187+
regioncx.solve(infcx, body, polonius_output.clone());
188188

189189
if !nll_errors.is_empty() {
190190
// Suppress unhelpful extra errors in `infer_opaque_types`.

‎compiler/rustc_borrowck/src/region_infer/mod.rs

+2-39
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
658658
pub(super) fn solve(
659659
&mut self,
660660
infcx: &InferCtxt<'tcx>,
661-
param_env: ty::ParamEnv<'tcx>,
662661
body: &Body<'tcx>,
663662
polonius_output: Option<Rc<PoloniusOutput>>,
664663
) -> (Option<ClosureRegionRequirements<'tcx>>, RegionErrors<'tcx>) {
@@ -674,7 +673,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
674673
// eagerly.
675674
let mut outlives_requirements = infcx.tcx.is_typeck_child(mir_def_id).then(Vec::new);
676675

677-
self.check_type_tests(infcx, body, outlives_requirements.as_mut(), &mut errors_buffer);
676+
self.check_type_tests(infcx, outlives_requirements.as_mut(), &mut errors_buffer);
678677

679678
debug!(?errors_buffer);
680679
debug!(?outlives_requirements);
@@ -932,7 +931,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
932931
fn check_type_tests(
933932
&self,
934933
infcx: &InferCtxt<'tcx>,
935-
body: &Body<'tcx>,
936934
mut propagated_outlives_requirements: Option<&mut Vec<ClosureOutlivesRequirement<'tcx>>>,
937935
errors_buffer: &mut RegionErrors<'tcx>,
938936
) {
@@ -957,12 +955,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
957955
}
958956

959957
if let Some(propagated_outlives_requirements) = &mut propagated_outlives_requirements {
960-
if self.try_promote_type_test(
961-
infcx,
962-
body,
963-
type_test,
964-
propagated_outlives_requirements,
965-
) {
958+
if self.try_promote_type_test(infcx, type_test, propagated_outlives_requirements) {
966959
continue;
967960
}
968961
}
@@ -1016,7 +1009,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
10161009
fn try_promote_type_test(
10171010
&self,
10181011
infcx: &InferCtxt<'tcx>,
1019-
body: &Body<'tcx>,
10201012
type_test: &TypeTest<'tcx>,
10211013
propagated_outlives_requirements: &mut Vec<ClosureOutlivesRequirement<'tcx>>,
10221014
) -> bool {
@@ -1179,35 +1171,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
11791171
Some(ClosureOutlivesSubject::Ty(ClosureOutlivesSubjectTy::bind(tcx, ty)))
11801172
}
11811173

1182-
/// Returns a universally quantified region that outlives the
1183-
/// value of `r` (`r` may be existentially or universally
1184-
/// quantified).
1185-
///
1186-
/// Since `r` is (potentially) an existential region, it has some
1187-
/// value which may include (a) any number of points in the CFG
1188-
/// and (b) any number of `end('x)` elements of universally
1189-
/// quantified regions. To convert this into a single universal
1190-
/// region we do as follows:
1191-
///
1192-
/// - Ignore the CFG points in `'r`. All universally quantified regions
1193-
/// include the CFG anyhow.
1194-
/// - For each `end('x)` element in `'r`, compute the mutual LUB, yielding
1195-
/// a result `'y`.
1196-
#[instrument(skip(self), level = "debug", ret)]
1197-
pub(crate) fn universal_upper_bound(&self, r: RegionVid) -> RegionVid {
1198-
debug!(r = %self.region_value_str(r));
1199-
1200-
// Find the smallest universal region that contains all other
1201-
// universal regions within `region`.
1202-
let mut lub = self.universal_regions.fr_fn_body;
1203-
let r_scc = self.constraint_sccs.scc(r);
1204-
for ur in self.scc_values.universal_regions_outlived_by(r_scc) {
1205-
lub = self.universal_region_relations.postdom_upper_bound(lub, ur);
1206-
}
1207-
1208-
lub
1209-
}
1210-
12111174
/// Like `universal_upper_bound`, but returns an approximation more suitable
12121175
/// for diagnostics. If `r` contains multiple disjoint universal regions
12131176
/// (e.g. 'a and 'b in `fn foo<'a, 'b> { ... }`, we pick the lower-numbered region.

‎compiler/rustc_borrowck/src/type_check/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ pub(crate) fn type_check<'mir, 'tcx>(
217217
CustomTypeOp::new(
218218
|ocx| {
219219
ocx.infcx.register_member_constraints(
220-
param_env,
221220
opaque_type_key,
222221
decl.hidden_type.ty,
223222
decl.hidden_type.span,

‎compiler/rustc_hir_analysis/src/astconv/bounds.rs

-2
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,7 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
235235
speculative: bool,
236236
dup_bindings: &mut FxHashMap<DefId, Span>,
237237
path_span: Span,
238-
constness: ty::BoundConstness,
239238
only_self_bounds: OnlySelfBounds,
240-
polarity: ty::ImplPolarity,
241239
) -> Result<(), ErrorGuaranteed> {
242240
// Given something like `U: SomeTrait<T = X>`, we want to produce a
243241
// predicate like `<U as SomeTrait>::T = X`. This is somewhat

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use rustc_middle::ty::{
1616
self, GenericArgsRef, GenericParamDef, GenericParamDefKind, IsSuggestable, Ty, TyCtxt,
1717
};
1818
use rustc_session::lint::builtin::LATE_BOUND_LIFETIME_ARGUMENTS;
19-
use rustc_span::{symbol::kw, Span};
19+
use rustc_span::symbol::kw;
2020
use smallvec::SmallVec;
2121

2222
/// Report an error that a generic argument did not match the generic parameter that was
@@ -404,7 +404,6 @@ pub fn create_args_for_parent_generic_args<'tcx: 'a, 'a>(
404404
/// Used specifically for function calls.
405405
pub fn check_generic_arg_count_for_call(
406406
tcx: TyCtxt<'_>,
407-
span: Span,
408407
def_id: DefId,
409408
generics: &ty::Generics,
410409
seg: &hir::PathSegment<'_>,
@@ -418,25 +417,14 @@ pub fn check_generic_arg_count_for_call(
418417
};
419418
let has_self = generics.parent.is_none() && generics.has_self;
420419

421-
check_generic_arg_count(
422-
tcx,
423-
span,
424-
def_id,
425-
seg,
426-
generics,
427-
gen_args,
428-
gen_pos,
429-
has_self,
430-
seg.infer_args,
431-
)
420+
check_generic_arg_count(tcx, def_id, seg, generics, gen_args, gen_pos, has_self, seg.infer_args)
432421
}
433422

434423
/// Checks that the correct number of generic arguments have been provided.
435424
/// This is used both for datatypes and function calls.
436425
#[instrument(skip(tcx, gen_pos), level = "debug")]
437426
pub(crate) fn check_generic_arg_count(
438427
tcx: TyCtxt<'_>,
439-
span: Span,
440428
def_id: DefId,
441429
seg: &hir::PathSegment<'_>,
442430
gen_params: &ty::Generics,

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

+3-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_hir as hir;
2525
use rustc_hir::def::{CtorOf, DefKind, Namespace, Res};
2626
use rustc_hir::def_id::{DefId, LocalDefId};
2727
use rustc_hir::intravisit::{walk_generics, Visitor as _};
28-
use rustc_hir::{GenericArg, GenericArgs, OpaqueTyOrigin};
28+
use rustc_hir::{GenericArg, GenericArgs};
2929
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
3030
use rustc_infer::traits::ObligationCause;
3131
use rustc_middle::middle::stability::AllowUnstable;
@@ -379,7 +379,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
379379

380380
let mut arg_count = check_generic_arg_count(
381381
tcx,
382-
span,
383382
def_id,
384383
seg,
385384
generics,
@@ -773,9 +772,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
773772
speculative,
774773
&mut dup_bindings,
775774
binding.span,
776-
constness,
777775
only_self_bounds,
778-
polarity,
779776
);
780777
// Okay to ignore `Err` because of `ErrorGuaranteed` (see above).
781778
}
@@ -2491,7 +2488,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
24912488
let opaque_ty = tcx.hir().item(item_id);
24922489

24932490
match opaque_ty.kind {
2494-
hir::ItemKind::OpaqueTy(&hir::OpaqueTy { origin, .. }) => {
2491+
hir::ItemKind::OpaqueTy(&hir::OpaqueTy { .. }) => {
24952492
let local_def_id = item_id.owner_id.def_id;
24962493
// If this is an RPITIT and we are using the new RPITIT lowering scheme, we
24972494
// generate the def_id of an associated type for the trait and return as
@@ -2501,7 +2498,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25012498
} else {
25022499
local_def_id.to_def_id()
25032500
};
2504-
self.impl_trait_ty_to_ty(def_id, lifetimes, origin, in_trait)
2501+
self.impl_trait_ty_to_ty(def_id, lifetimes, in_trait)
25052502
}
25062503
ref i => bug!("`impl Trait` pointed to non-opaque type?? {:#?}", i),
25072504
}
@@ -2571,7 +2568,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25712568
&self,
25722569
def_id: DefId,
25732570
lifetimes: &[hir::GenericArg<'_>],
2574-
origin: OpaqueTyOrigin,
25752571
in_trait: bool,
25762572
) -> Ty<'tcx> {
25772573
debug!("impl_trait_ty_to_ty(def_id={:?}, lifetimes={:?})", def_id, lifetimes);

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
521521
/// We must not attempt to select obligations after this method has run, or risk query cycle
522522
/// ICE.
523523
#[instrument(level = "debug", skip(self))]
524-
pub(in super::super) fn resolve_coroutine_interiors(&self, def_id: DefId) {
524+
pub(in super::super) fn resolve_coroutine_interiors(&self) {
525525
// Try selecting all obligations that are not blocked on inference variables.
526526
// Once we start unifying coroutine witnesses, trying to select obligations on them will
527527
// trigger query cycle ICEs, as doing so requires MIR.
@@ -1175,14 +1175,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
11751175
// parameter internally, but we don't allow users to specify the
11761176
// parameter's value explicitly, so we have to do some error-
11771177
// checking here.
1178-
let arg_count = check_generic_arg_count_for_call(
1179-
tcx,
1180-
span,
1181-
def_id,
1182-
generics,
1183-
seg,
1184-
IsMethodCall::No,
1185-
);
1178+
let arg_count =
1179+
check_generic_arg_count_for_call(tcx, def_id, generics, seg, IsMethodCall::No);
11861180

11871181
if let ExplicitLateBound::Yes = arg_count.explicit_late_bound {
11881182
explicit_late_bound = ExplicitLateBound::Yes;

‎compiler/rustc_hir_typeck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fn typeck_with_fallback<'tcx>(
286286
debug!(pending_obligations = ?fcx.fulfillment_cx.borrow().pending_obligations());
287287

288288
// This must be the last thing before `report_ambiguity_errors`.
289-
fcx.resolve_coroutine_interiors(def_id.to_def_id());
289+
fcx.resolve_coroutine_interiors();
290290

291291
debug!(pending_obligations = ?fcx.fulfillment_cx.borrow().pending_obligations());
292292

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
436436
pub(crate) fn cat_rvalue(
437437
&self,
438438
hir_id: hir::HirId,
439-
span: Span,
439+
// FIXME: remove
440+
_span: Span,
440441
expr_ty: Ty<'tcx>,
441442
) -> PlaceWithHirId<'tcx> {
442443
PlaceWithHirId::new(hir_id, expr_ty, PlaceBase::Rvalue, Vec::new())

‎compiler/rustc_hir_typeck/src/method/confirm.rs

-1
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
356356

357357
let arg_count_correct = check_generic_arg_count_for_call(
358358
self.tcx,
359-
self.span,
360359
pick.item.def_id,
361360
generics,
362361
seg,

‎compiler/rustc_infer/src/infer/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ impl<'tcx> InferCtxt<'tcx> {
862862
}
863863

864864
#[instrument(skip(self, snapshot), level = "debug")]
865-
fn rollback_to(&self, cause: &str, snapshot: CombinedSnapshot<'tcx>) {
865+
fn rollback_to(&self, snapshot: CombinedSnapshot<'tcx>) {
866866
let CombinedSnapshot { undo_snapshot, region_constraints_snapshot, universe } = snapshot;
867867

868868
self.universe.set(universe);
@@ -894,7 +894,7 @@ impl<'tcx> InferCtxt<'tcx> {
894894
self.commit_from(snapshot);
895895
}
896896
Err(_) => {
897-
self.rollback_to("commit_if_ok -- error", snapshot);
897+
self.rollback_to(snapshot);
898898
}
899899
}
900900
r
@@ -908,7 +908,7 @@ impl<'tcx> InferCtxt<'tcx> {
908908
{
909909
let snapshot = self.start_snapshot();
910910
let r = f(&snapshot);
911-
self.rollback_to("probe", snapshot);
911+
self.rollback_to(snapshot);
912912
r
913913
}
914914

‎compiler/rustc_infer/src/infer/opaque_types.rs

-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ impl<'tcx> InferCtxt<'tcx> {
327327
#[instrument(level = "debug", skip(self))]
328328
pub fn register_member_constraints(
329329
&self,
330-
param_env: ty::ParamEnv<'tcx>,
331330
opaque_type_key: OpaqueTypeKey<'tcx>,
332331
concrete_ty: Ty<'tcx>,
333332
span: Span,

‎compiler/rustc_infer/src/infer/relate/combine.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,11 @@ impl<'tcx> InferCtxt<'tcx> {
225225
}
226226

227227
(ty::ConstKind::Infer(InferConst::Var(vid)), _) => {
228-
return self.unify_const_variable(vid, b, relation.param_env());
228+
return self.unify_const_variable(vid, b);
229229
}
230230

231231
(_, ty::ConstKind::Infer(InferConst::Var(vid))) => {
232-
return self.unify_const_variable(vid, a, relation.param_env());
232+
return self.unify_const_variable(vid, a);
233233
}
234234

235235
(ty::ConstKind::Infer(InferConst::EffectVar(vid)), _) => {
@@ -310,7 +310,6 @@ impl<'tcx> InferCtxt<'tcx> {
310310
&self,
311311
target_vid: ty::ConstVid,
312312
ct: ty::Const<'tcx>,
313-
param_env: ty::ParamEnv<'tcx>,
314313
) -> RelateResult<'tcx, ty::Const<'tcx>> {
315314
let span = match self.inner.borrow_mut().const_unification_table().probe_value(target_vid) {
316315
ConstVariableValue::Known { value } => {

‎compiler/rustc_middle/src/thir.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,6 @@ impl<'tcx> PatRangeBoundary<'tcx> {
10381038
a.partial_cmp(&b)
10391039
}
10401040
ty::Int(ity) => {
1041-
use rustc_middle::ty::layout::IntegerExt;
10421041
let size = rustc_target::abi::Integer::from_int_ty(&tcx, *ity).size();
10431042
let a = size.sign_extend(a) as i128;
10441043
let b = size.sign_extend(b) as i128;

‎compiler/rustc_middle/src/ty/_match.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl<'tcx> TypeRelation<'tcx> for MatchAgainstFreshVars<'tcx> {
5555
fn regions(
5656
&mut self,
5757
a: ty::Region<'tcx>,
58-
b: ty::Region<'tcx>,
58+
_b: ty::Region<'tcx>,
5959
) -> RelateResult<'tcx, ty::Region<'tcx>> {
6060
Ok(a)
6161
}

‎compiler/rustc_mir_transform/src/const_prop_lint.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
541541
}
542542

543543
#[instrument(level = "trace", skip(self), ret)]
544-
fn eval_rvalue(
545-
&mut self,
546-
rvalue: &Rvalue<'tcx>,
547-
location: Location,
548-
dest: &Place<'tcx>,
549-
) -> Option<()> {
544+
fn eval_rvalue(&mut self, rvalue: &Rvalue<'tcx>, dest: &Place<'tcx>) -> Option<()> {
550545
if !dest.projection.is_empty() {
551546
return None;
552547
}
@@ -733,7 +728,7 @@ impl<'tcx> Visitor<'tcx> for ConstPropagator<'_, 'tcx> {
733728
_ if place.is_indirect() => {}
734729
ConstPropMode::NoPropagation => self.ensure_not_propagated(place.local),
735730
ConstPropMode::OnlyInsideOwnBlock | ConstPropMode::FullConstProp => {
736-
if self.eval_rvalue(rvalue, location, place).is_none() {
731+
if self.eval_rvalue(rvalue, place).is_none() {
737732
// Const prop failed, so erase the destination, ensuring that whatever happens
738733
// from here on, does not know about the previous value.
739734
// This is important in case we have

‎compiler/rustc_pattern_analysis/src/lints.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::MatchArm;
1010
/// Traverse the patterns to collect any variants of a non_exhaustive enum that fail to be mentioned
1111
/// in a given column.
1212
#[instrument(level = "debug", skip(cx), ret)]
13-
fn collect_nonexhaustive_missing_variants<'a, 'p, 'tcx>(
13+
fn collect_nonexhaustive_missing_variants<'p, 'tcx>(
1414
cx: &RustcMatchCheckCtxt<'p, 'tcx>,
1515
column: &PatternColumn<'p, RustcMatchCheckCtxt<'p, 'tcx>>,
1616
) -> Result<Vec<WitnessPat<'p, 'tcx>>, ErrorGuaranteed> {

‎compiler/rustc_query_system/src/dep_graph/graph.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl From<DepNodeIndex> for QueryInvocationId {
5252
}
5353
}
5454

55-
pub(crate) struct MarkFrame<'a> {
55+
pub struct MarkFrame<'a> {
5656
index: SerializedDepNodeIndex,
5757
parent: Option<&'a MarkFrame<'a>>,
5858
}
@@ -754,7 +754,6 @@ impl<D: Deps> DepGraphData<D> {
754754
&self,
755755
qcx: Qcx,
756756
parent_dep_node_index: SerializedDepNodeIndex,
757-
dep_node: &DepNode,
758757
frame: Option<&MarkFrame<'_>>,
759758
) -> Option<()> {
760759
let dep_dep_node_color = self.colors.get(parent_dep_node_index);
@@ -861,7 +860,7 @@ impl<D: Deps> DepGraphData<D> {
861860
let prev_deps = self.previous.edge_targets_from(prev_dep_node_index);
862861

863862
for dep_dep_node_index in prev_deps {
864-
self.try_mark_parent_green(qcx, dep_dep_node_index, dep_node, Some(&frame))?;
863+
self.try_mark_parent_green(qcx, dep_dep_node_index, Some(&frame))?;
865864
}
866865

867866
// If we got here without hitting a `return` that means that all

0 commit comments

Comments
 (0)