Give EarlyBinder a tcx parameter · rust-lang/rust@bbcdb4f (original) (raw)

`@@ -209,7 +209,7 @@ rustc_queries! {

`

209

209

``

210

210

`/// Given the def_id of a const-generic parameter, computes the associated default const

`

211

211

`` /// parameter. e.g. fn example<const N: usize=3> called on N would return 3.

``

212

``

`-

query const_param_default(param: DefId) -> ty::EarlyBinder<ty::Const<'tcx>> {

`

``

212

`+

query const_param_default(param: DefId) -> ty::EarlyBinder<'tcx, ty::Const<'tcx>> {

`

213

213

`` desc { |tcx| "computing const default for a given parameter {}", tcx.def_path_str(param) }

``

214

214

` cache_on_disk_if { param.is_local() }

`

215

215

` separate_provide_extern

`

`@@ -219,7 +219,7 @@ rustc_queries! {

`

219

219

`/// to an alias, it will "skip" this alias to return the aliased type.

`

220

220

`///

`

221

221

`` /// [DefId]: rustc_hir::def_id::DefId

``

222

``

`-

query type_of(key: DefId) -> ty::EarlyBinder<Ty<'tcx>> {

`

``

222

`+

query type_of(key: DefId) -> ty::EarlyBinder<'tcx, Ty<'tcx>> {

`

223

223

` desc { |tcx|

`

224

224

`` "{action} {path}",

``

225

225

` action = {

`

`@@ -240,7 +240,7 @@ rustc_queries! {

`

240

240

`` /// Specialized instance of type_of that detects cycles that are due to

``

241

241

`` /// revealing opaque because of an auto trait bound. Unless CyclePlaceholder needs

``

242

242

`` /// to be handled separately, call type_of instead.

``

243

``

`-

query type_of_opaque(key: DefId) -> Result<ty::EarlyBinder<Ty<'tcx>>, CyclePlaceholder> {

`

``

243

`+

query type_of_opaque(key: DefId) -> Result<ty::EarlyBinder<'tcx, Ty<'tcx>>, CyclePlaceholder> {

`

244

244

` desc { |tcx|

`

245

245

`` "computing type of opaque {path}",

``

246

246

` path = tcx.def_path_str(key),

`

`@@ -257,7 +257,7 @@ rustc_queries! {

`

257

257

`}

`

258

258

``

259

259

` query collect_return_position_impl_trait_in_trait_tys(key: DefId)

`

260

``

`-

-> Result<&'tcx DefIdMap<ty::EarlyBinder<Ty<'tcx>>>, ErrorGuaranteed>

`

``

260

`+

-> Result<&'tcx DefIdMap<ty::EarlyBinder<'tcx, Ty<'tcx>>>, ErrorGuaranteed>

`

261

261

`{

`

262

262

`` desc { "comparing an impl and trait method signature, inferring any hidden impl Trait types in the process" }

``

263

263

` cache_on_disk_if { key.is_local() }

`

`@@ -363,7 +363,7 @@ rustc_queries! {

`

363

363

`` /// key is the DefId of the associated type or opaque type.

``

364

364

`///

`

365

365

`/// Bounds from the parent (e.g. with nested impl trait) are not included.

`

366

``

`-

query explicit_item_bounds(key: DefId) -> ty::EarlyBinder<&'tcx [(ty::Clause<'tcx>, Span)]> {

`

``

366

`+

query explicit_item_bounds(key: DefId) -> ty::EarlyBinder<'tcx, &'tcx [(ty::Clause<'tcx>, Span)]> {

`

367

367

`` desc { |tcx| "finding item bounds for {}", tcx.def_path_str(key) }

``

368

368

` cache_on_disk_if { key.is_local() }

`

369

369

` separate_provide_extern

`

`@@ -373,7 +373,7 @@ rustc_queries! {

`

373

373

`` /// share the Self type of the item. These are a subset of the bounds

``

374

374

`/// that may explicitly be used for things like closure signature

`

375

375

`/// deduction.

`

376

``

`-

query explicit_item_super_predicates(key: DefId) -> ty::EarlyBinder<&'tcx [(ty::Clause<'tcx>, Span)]> {

`

``

376

`+

query explicit_item_super_predicates(key: DefId) -> ty::EarlyBinder<'tcx, &'tcx [(ty::Clause<'tcx>, Span)]> {

`

377

377

`` desc { |tcx| "finding item bounds for {}", tcx.def_path_str(key) }

``

378

378

` cache_on_disk_if { key.is_local() }

`

379

379

` separate_provide_extern

`

`@@ -399,15 +399,15 @@ rustc_queries! {

`

399

399

```` /// ```

````

400

400

`///

`

401

401

`/// Bounds from the parent (e.g. with nested impl trait) are not included.

`

402

``

`-

query item_bounds(key: DefId) -> ty::EarlyBinder<ty::Clauses<'tcx>> {

`

``

402

`+

query item_bounds(key: DefId) -> ty::EarlyBinder<'tcx, ty::Clauses<'tcx>> {

`

403

403

`` desc { |tcx| "elaborating item bounds for {}", tcx.def_path_str(key) }

``

404

404

`}

`

405

405

``

406

``

`-

query item_super_predicates(key: DefId) -> ty::EarlyBinder<ty::Clauses<'tcx>> {

`

``

406

`+

query item_super_predicates(key: DefId) -> ty::EarlyBinder<'tcx, ty::Clauses<'tcx>> {

`

407

407

`` desc { |tcx| "elaborating item assumptions for {}", tcx.def_path_str(key) }

``

408

408

`}

`

409

409

``

410

``

`-

query item_non_self_assumptions(key: DefId) -> ty::EarlyBinder<ty::Clauses<'tcx>> {

`

``

410

`+

query item_non_self_assumptions(key: DefId) -> ty::EarlyBinder<'tcx, ty::Clauses<'tcx>> {

`

411

411

`` desc { |tcx| "elaborating item assumptions for {}", tcx.def_path_str(key) }

``

412

412

`}

`

413

413

``

`@@ -504,7 +504,7 @@ rustc_queries! {

`

504

504

`/// Try to build an abstract representation of the given constant.

`

505

505

` query thir_abstract_const(

`

506

506

` key: DefId

`

507

``

`-

) -> Result<Option<ty::EarlyBinder<ty::Const<'tcx>>>, ErrorGuaranteed> {

`

``

507

`+

) -> Result<Option<ty::EarlyBinder<'tcx, ty::Const<'tcx>>>, ErrorGuaranteed> {

`

508

508

` desc {

`

509

509

`` |tcx| "building an abstract representation for {}", tcx.def_path_str(key),

``

510

510

`}

`

`@@ -704,7 +704,7 @@ rustc_queries! {

`

704

704

` separate_provide_extern

`

705

705

`}

`

706

706

``

707

``

`-

query adt_sized_constraint(key: DefId) -> Option<ty::EarlyBinder<Ty<'tcx>>> {

`

``

707

`+

query adt_sized_constraint(key: DefId) -> Option<ty::EarlyBinder<'tcx, Ty<'tcx>>> {

`

708

708

`` desc { |tcx| "computing the Sized constraint for {}", tcx.def_path_str(key) }

``

709

709

`}

`

710

710

``

`@@ -849,7 +849,7 @@ rustc_queries! {

`

849

849

``

850

850

` query self_ty_of_trait_impl_enabling_order_dep_trait_object_hack(

`

851

851

` key: DefId

`

852

``

`-

) -> Option<ty::EarlyBinder<ty::Ty<'tcx>>> {

`

``

852

`+

) -> Option<ty::EarlyBinder<'tcx, ty::Ty<'tcx>>> {

`

853

853

`` desc { |tcx| "computing self type wrt issue #33140 {}", tcx.def_path_str(key) }

``

854

854

`}

`

855

855

``

`@@ -888,7 +888,7 @@ rustc_queries! {

`

888

888

`}

`

889

889

``

890

890

`/// Computes the signature of the function.

`

891

``

`-

query fn_sig(key: DefId) -> ty::EarlyBinder<ty::PolyFnSig<'tcx>> {

`

``

891

`+

query fn_sig(key: DefId) -> ty::EarlyBinder<'tcx, ty::PolyFnSig<'tcx>> {

`

892

892

`` desc { |tcx| "computing function signature of {}", tcx.def_path_str(key) }

``

893

893

` cache_on_disk_if { key.is_local() }

`

894

894

` separate_provide_extern

`