Auto merge of #114781 - fee1-dead-contrib:param-impl-source, r=davidtwco · rust-lang/rust@475be26 (original) (raw)

`@@ -649,7 +649,7 @@ pub enum ImplSource<'tcx, N> {

`

649

649

`` /// for some type parameter. The Vec<N> represents the

``

650

650

`/// obligations incurred from normalizing the where-clause (if

`

651

651

`/// any).

`

652

``

`-

Param(ty::BoundConstness, Vec),

`

``

652

`+

Param(Vec),

`

653

653

``

654

654

`/// Successful resolution for a builtin impl.

`

655

655

`Builtin(BuiltinImplSource, Vec),

`

`@@ -659,21 +659,21 @@ impl<'tcx, N> ImplSource<'tcx, N> {

`

659

659

`pub fn nested_obligations(self) -> Vec {

`

660

660

`match self {

`

661

661

`ImplSource::UserDefined(i) => i.nested,

`

662

``

`-

ImplSource::Param(, n) | ImplSource::Builtin(, n) => n,

`

``

662

`+

ImplSource::Param(n) | ImplSource::Builtin(_, n) => n,

`

663

663

`}

`

664

664

`}

`

665

665

``

666

666

`pub fn borrow_nested_obligations(&self) -> &[N] {

`

667

667

`match self {

`

668

668

`ImplSource::UserDefined(i) => &i.nested,

`

669

``

`-

ImplSource::Param(, n) | ImplSource::Builtin(, n) => &n,

`

``

669

`+

ImplSource::Param(n) | ImplSource::Builtin(_, n) => &n,

`

670

670

`}

`

671

671

`}

`

672

672

``

673

673

`pub fn borrow_nested_obligations_mut(&mut self) -> &mut [N] {

`

674

674

`match self {

`

675

675

`ImplSource::UserDefined(i) => &mut i.nested,

`

676

``

`-

ImplSource::Param(, n) | ImplSource::Builtin(, n) => n,

`

``

676

`+

ImplSource::Param(n) | ImplSource::Builtin(_, n) => n,

`

677

677

`}

`

678

678

`}

`

679

679

``

`@@ -687,7 +687,7 @@ impl<'tcx, N> ImplSource<'tcx, N> {

`

687

687

`args: i.args,

`

688

688

`nested: i.nested.into_iter().map(f).collect(),

`

689

689

`}),

`

690

``

`-

ImplSource::Param(ct, n) => ImplSource::Param(ct, n.into_iter().map(f).collect()),

`

``

690

`+

ImplSource::Param(n) => ImplSource::Param(n.into_iter().map(f).collect()),

`

691

691

`ImplSource::Builtin(source, n) => {

`

692

692

`ImplSource::Builtin(source, n.into_iter().map(f).collect())

`

693

693

`}

`