diff options
| author | ljedrz <ljedrz@gmail.com> | 2019-02-26 15:27:56 +0100 |
|---|---|---|
| committer | ljedrz <ljedrz@gmail.com> | 2019-03-01 11:18:49 +0100 |
| commit | 2827f8d4fef702b778aef044d044cd51e655e9cd (patch) | |
| tree | 35437af3c1c459844f232d8fcae490b3f8a21ffa /src | |
| parent | a29ceb9f51390293e0833f763b7490e70da255c5 (diff) | |
| download | rust-2827f8d4fef702b778aef044d044cd51e655e9cd.tar.gz rust-2827f8d4fef702b778aef044d044cd51e655e9cd.zip | |
hir: remove NodeId from TypeBinding
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/hir/lowering.rs | 9 | ||||
| -rw-r--r-- | src/librustc/hir/mod.rs | 1 | ||||
| -rw-r--r-- | src/librustc/ich/impls_hir.rs | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 856550aa018..33d95149e9c 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -1151,10 +1151,9 @@ impl<'a> LoweringContext<'a> { fn lower_ty_binding(&mut self, b: &TypeBinding, itctx: ImplTraitContext<'_>) -> hir::TypeBinding { - let LoweredNodeId { node_id, hir_id } = self.lower_node_id(b.id); + let LoweredNodeId { node_id: _, hir_id } = self.lower_node_id(b.id); hir::TypeBinding { - id: node_id, hir_id, ident: b.ident, ty: self.lower_ty(&b.ty, itctx), @@ -1982,14 +1981,13 @@ impl<'a> LoweringContext<'a> { let LoweredNodeId { node_id: _, hir_id } = this.next_id(); hir::Ty { node: hir::TyKind::Tup(tys), hir_id, span } }; - let LoweredNodeId { node_id, hir_id } = this.next_id(); + let LoweredNodeId { node_id: _, hir_id } = this.next_id(); ( hir::GenericArgs { args: hir_vec![GenericArg::Type(mk_tup(this, inputs, span))], bindings: hir_vec![ hir::TypeBinding { - id: node_id, hir_id, ident: Ident::from_str(FN_OUTPUT_NAME), ty: output @@ -2326,13 +2324,12 @@ impl<'a> LoweringContext<'a> { }; // "<Output = T>" - let LoweredNodeId { node_id, hir_id } = this.next_id(); + let LoweredNodeId { node_id: _, hir_id } = this.next_id(); let future_params = P(hir::GenericArgs { args: hir_vec![], bindings: hir_vec![hir::TypeBinding { ident: Ident::from_str(FN_OUTPUT_NAME), ty: output_ty, - id: node_id, hir_id, span, }], diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 1a95d567c72..3d272c0e251 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1737,7 +1737,6 @@ pub enum ImplItemKind { // Bind a type to an associated type: `A=Foo`. #[derive(Clone, RustcEncodable, RustcDecodable, Debug)] pub struct TypeBinding { - pub id: NodeId, pub hir_id: HirId, pub ident: Ident, pub ty: P<Ty>, diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs index 5774b104914..d601d1e1557 100644 --- a/src/librustc/ich/impls_hir.rs +++ b/src/librustc/ich/impls_hir.rs @@ -294,7 +294,6 @@ impl_stable_hash_for!(struct hir::MethodSig { }); impl_stable_hash_for!(struct hir::TypeBinding { - id, hir_id, ident -> (ident.name), ty, |