A few small cleanups for newtype_index

Noratrieb · Noratrieb · commit 8bfd6450c7b6 · 2022-12-18T21:47:28.000+01:00
Remove the `..` from the body, only a few invocations used it and it's
inconsistent with rust syntax.

Use `;` instead of `,` between consts. As the Rust syntax gods inteded.
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -2556,8 +2556,7 @@ pub enum AttrStyle {
 rustc_index::newtype_index! {
     #[custom_encodable]
     #[debug_format = "AttrId({})]"]
-    pub struct AttrId {
-    }
+    pub struct AttrId {}
 }
 
 impl<S: Encoder> Encodable<S> for AttrId {
diff --git a/compiler/rustc_ast/src/node_id.rs b/compiler/rustc_ast/src/node_id.rs
@@ -9,8 +9,7 @@ rustc_index::newtype_index! {
     ///
     /// [`DefId`]: rustc_span::def_id::DefId
     #[debug_format = "NodeId({})"]
-    pub struct NodeId {
-    }
+    pub struct NodeId {}
 }
 
 rustc_data_structures::define_id_collections!(NodeMap, NodeSet, NodeMapEntry, NodeId);
diff --git a/compiler/rustc_borrowck/src/constraints/mod.rs b/compiler/rustc_borrowck/src/constraints/mod.rs
@@ -116,12 +116,10 @@ impl<'tcx> fmt::Debug for OutlivesConstraint<'tcx> {
 
 rustc_index::newtype_index! {
     #[debug_format = "OutlivesConstraintIndex({})"]
-    pub struct OutlivesConstraintIndex {
-    }
+    pub struct OutlivesConstraintIndex {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "ConstraintSccIndex({})"]
-    pub struct ConstraintSccIndex {
-    }
+    pub struct ConstraintSccIndex {}
 }
diff --git a/compiler/rustc_borrowck/src/dataflow.rs b/compiler/rustc_borrowck/src/dataflow.rs
@@ -109,8 +109,7 @@ impl_visitable! {
 
 rustc_index::newtype_index! {
     #[debug_format = "bw{}"]
-    pub struct BorrowIndex {
-    }
+    pub struct BorrowIndex {}
 }
 
 /// `Borrows` stores the data used in the analyses that track the flow
diff --git a/compiler/rustc_borrowck/src/location.rs b/compiler/rustc_borrowck/src/location.rs
@@ -21,8 +21,7 @@ pub struct LocationTable {
 
 rustc_index::newtype_index! {
     #[debug_format = "LocationIndex({})"]
-    pub struct LocationIndex {
-    }
+    pub struct LocationIndex {}
 }
 
 #[derive(Copy, Clone, Debug)]
diff --git a/compiler/rustc_borrowck/src/member_constraints.rs b/compiler/rustc_borrowck/src/member_constraints.rs
@@ -56,8 +56,7 @@ pub(crate) struct NllMemberConstraint<'tcx> {
 
 rustc_index::newtype_index! {
     #[debug_format = "MemberConstraintIndex({})"]
-    pub(crate) struct NllMemberConstraintIndex {
-    }
+    pub(crate) struct NllMemberConstraintIndex {}
 }
 
 impl Default for MemberConstraintSet<'_, ty::RegionVid> {
diff --git a/compiler/rustc_borrowck/src/type_check/liveness/local_use_map.rs b/compiler/rustc_borrowck/src/type_check/liveness/local_use_map.rs
@@ -46,7 +46,7 @@ struct Appearance {
 }
 
 rustc_index::newtype_index! {
-    pub struct AppearanceIndex { .. }
+    pub struct AppearanceIndex {}
 }
 
 impl vll::LinkElem for Appearance {
diff --git a/compiler/rustc_data_structures/src/graph/dominators/mod.rs b/compiler/rustc_data_structures/src/graph/dominators/mod.rs
@@ -22,7 +22,7 @@ struct PreOrderFrame<Iter> {
 }
 
 rustc_index::newtype_index! {
-    struct PreorderIndex { .. }
+    struct PreorderIndex {}
 }
 
 pub fn dominators<G: ControlFlowGraph>(graph: G) -> Dominators<G::Node> {
diff --git a/compiler/rustc_hir/src/hir_id.rs b/compiler/rustc_hir/src/hir_id.rs
@@ -138,7 +138,7 @@ rustc_index::newtype_index! {
     /// an "item-like" to something else can be implemented by a `Vec` instead of a
     /// tree or hash map.
     #[derive(HashStable_Generic)]
-    pub struct ItemLocalId { .. }
+    pub struct ItemLocalId {}
 }
 
 impl ItemLocalId {
diff --git a/compiler/rustc_hir_analysis/src/coherence/inherent_impls_overlap.rs b/compiler/rustc_hir_analysis/src/coherence/inherent_impls_overlap.rs
@@ -199,9 +199,9 @@ impl<'tcx> InherentOverlapChecker<'tcx> {
 
             rustc_index::newtype_index! {
                 #[custom_encodable]
-                pub struct RegionId {
-                }
+                pub struct RegionId {}
             }
+
             struct ConnectedRegion {
                 idents: SmallVec<[Symbol; 8]>,
                 impl_blocks: FxHashSet<usize>,
diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/arg_matrix.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/arg_matrix.rs
@@ -5,14 +5,12 @@ use rustc_middle::ty::error::TypeError;
 
 rustc_index::newtype_index! {
     #[debug_format = "ExpectedIdx({})"]
-    pub(crate) struct ExpectedIdx {
-    }
+    pub(crate) struct ExpectedIdx {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "ProvidedIdx({})"]
-    pub(crate) struct ProvidedIdx {
-    }
+    pub(crate) struct ProvidedIdx {}
 }
 
 impl ExpectedIdx {
diff --git a/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/mod.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/mod.rs
@@ -97,14 +97,12 @@ fn for_each_consumable<'tcx>(hir: Map<'tcx>, place: TrackedValue, mut f: impl Fn
 
 rustc_index::newtype_index! {
     #[debug_format = "id({})"]
-    pub struct PostOrderId {
-    }
+    pub struct PostOrderId {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "hidx({})"]
-    pub struct TrackedValueIndex {
-    }
+    pub struct TrackedValueIndex {}
 }
 
 /// Identifies a value whose drop state we need to track.
diff --git a/compiler/rustc_index/src/vec/tests.rs b/compiler/rustc_index/src/vec/tests.rs
@@ -5,7 +5,7 @@ use crate as rustc_index;
 
 rustc_macros::newtype_index! {
     #[max = 0xFFFF_FFFA]
-    struct MyIdx { }
+    struct MyIdx {}
 }
 
 #[test]
diff --git a/compiler/rustc_infer/src/infer/region_constraints/leak_check.rs b/compiler/rustc_infer/src/infer/region_constraints/leak_check.rs
@@ -358,14 +358,12 @@ impl<'tcx> SccUniverse<'tcx> {
 
 rustc_index::newtype_index! {
     #[debug_format = "LeakCheckNode({})"]
-    struct LeakCheckNode {
-    }
+    struct LeakCheckNode {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "LeakCheckScc({})"]
-    struct LeakCheckScc {
-    }
+    struct LeakCheckScc {}
 }
 
 /// Represents the graph of constraints. For each `R1: R2` constraint we create
diff --git a/compiler/rustc_lint/src/levels.rs b/compiler/rustc_lint/src/levels.rs
@@ -41,7 +41,7 @@ struct LintLevelSets {
 rustc_index::newtype_index! {
     #[custom_encodable] // we don't need encoding
     struct LintStackIndex {
-        const COMMAND_LINE = 0,
+        const COMMAND_LINE = 0;
     }
 }
 
diff --git a/compiler/rustc_macros/src/newtype.rs b/compiler/rustc_macros/src/newtype.rs
@@ -25,14 +25,6 @@ impl Parse for Newtype {
         let mut encodable = true;
         let mut ord = true;
 
-        // Parse an optional trailing comma
-        let try_comma = || -> Result<()> {
-            if body.lookahead1().peek(Token![,]) {
-                body.parse::<Token![,]>()?;
-            }
-            Ok(())
-        };
-
         attrs.retain(|attr| match attr.path.get_ident() {
             Some(ident) => match &*ident.to_string() {
                 "custom_encodable" => {
@@ -70,24 +62,20 @@ impl Parse for Newtype {
             _ => true,
         });
 
-        if body.lookahead1().peek(Token![..]) {
-            body.parse::<Token![..]>()?;
-        } else {
-            loop {
-                // We've parsed everything that the user provided, so we're done
-                if body.is_empty() {
-                    break;
-                }
-
-                // Otherwise, we are parsing a user-defined constant
-                let const_attrs = body.call(Attribute::parse_outer)?;
-                body.parse::<Token![const]>()?;
-                let const_name: Ident = body.parse()?;
-                body.parse::<Token![=]>()?;
-                let const_val: Expr = body.parse()?;
-                try_comma()?;
-                consts.push(quote! { #(#const_attrs)* #vis const #const_name: #name = #name::from_u32(#const_val); });
+        loop {
+            // We've parsed everything that the user provided, so we're done
+            if body.is_empty() {
+                break;
             }
+
+            // Otherwise, we are parsing a user-defined constant
+            let const_attrs = body.call(Attribute::parse_outer)?;
+            body.parse::<Token![const]>()?;
+            let const_name: Ident = body.parse()?;
+            body.parse::<Token![=]>()?;
+            let const_val: Expr = body.parse()?;
+            body.parse::<Token![;]>()?;
+            consts.push(quote! { #(#const_attrs)* #vis const #const_name: #name = #name::from_u32(#const_val); });
         }
 
         let debug_format =
diff --git a/compiler/rustc_middle/src/middle/region.rs b/compiler/rustc_middle/src/middle/region.rs
@@ -148,8 +148,7 @@ rustc_index::newtype_index! {
     /// * The subscope with `first_statement_index == 1` is scope of `c`,
     ///   and thus does not include EXPR_2, but covers the `...`.
     #[derive(HashStable)]
-    pub struct FirstStatementIndex {
-    }
+    pub struct FirstStatementIndex {}
 }
 
 // compilation error if size of `ScopeData` is not the same as a `u32`
diff --git a/compiler/rustc_middle/src/mir/coverage.rs b/compiler/rustc_middle/src/mir/coverage.rs
@@ -35,8 +35,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "CounterValueReference({})"]
-    pub struct CounterValueReference {
-    }
+    pub struct CounterValueReference {}
 }
 
 impl CounterValueReference {
@@ -59,8 +58,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "InjectedExpressionId({})"]
-    pub struct InjectedExpressionId {
-    }
+    pub struct InjectedExpressionId {}
 }
 
 rustc_index::newtype_index! {
@@ -70,8 +68,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "InjectedExpressionIndex({})"]
-    pub struct InjectedExpressionIndex {
-    }
+    pub struct InjectedExpressionIndex {}
 }
 
 rustc_index::newtype_index! {
@@ -81,8 +78,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "MappedExpressionIndex({})"]
-    pub struct MappedExpressionIndex {
-    }
+    pub struct MappedExpressionIndex {}
 }
 
 impl From<CounterValueReference> for ExpressionOperandId {
diff --git a/compiler/rustc_middle/src/mir/mod.rs b/compiler/rustc_middle/src/mir/mod.rs
@@ -657,7 +657,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "_{}"]
     pub struct Local {
-        const RETURN_PLACE = 0,
+        const RETURN_PLACE = 0;
     }
 }
 
@@ -1149,7 +1149,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "bb{}"]
     pub struct BasicBlock {
-        const START_BLOCK = 0,
+        const START_BLOCK = 0;
     }
 }
 
@@ -1532,8 +1532,7 @@ rustc_index::newtype_index! {
     /// [mir-datatypes]: https://rustc-dev-guide.rust-lang.org/mir/index.html#mir-data-types
     #[derive(HashStable)]
     #[debug_format = "field[{}]"]
-    pub struct Field {
-    }
+    pub struct Field {}
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
@@ -1760,7 +1759,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "scope[{}]"]
     pub struct SourceScope {
-        const OUTERMOST_SOURCE_SCOPE = 0,
+        const OUTERMOST_SOURCE_SCOPE = 0;
     }
 }
 
@@ -2757,8 +2756,7 @@ impl<'tcx> TypeVisitable<'tcx> for UserTypeProjection {
 rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "promoted[{}]"]
-    pub struct Promoted {
-    }
+    pub struct Promoted {}
 }
 
 impl<'tcx> Debug for Constant<'tcx> {
diff --git a/compiler/rustc_middle/src/mir/query.rs b/compiler/rustc_middle/src/mir/query.rs
@@ -132,8 +132,7 @@ pub struct UnsafetyCheckResult {
 rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "_{}"]
-    pub struct GeneratorSavedLocal {
-    }
+    pub struct GeneratorSavedLocal {}
 }
 
 /// The layout of generator state.
diff --git a/compiler/rustc_middle/src/thir.rs b/compiler/rustc_middle/src/thir.rs
@@ -36,8 +36,7 @@ macro_rules! thir_with_elements {
             newtype_index! {
                 #[derive(HashStable)]
                 #[debug_format = $format]
-                pub struct $id {
-                }
+                pub struct $id {}
             }
         )*
 
diff --git a/compiler/rustc_middle/src/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs
@@ -1379,8 +1379,7 @@ rustc_index::newtype_index! {
     /// A **region** (lifetime) **v**ariable **ID**.
     #[derive(HashStable)]
     #[debug_format = "'_#{}r"]
-    pub struct RegionVid {
-    }
+    pub struct RegionVid {}
 }
 
 impl Atom for RegionVid {
@@ -1391,7 +1390,7 @@ impl Atom for RegionVid {
 
 rustc_index::newtype_index! {
     #[derive(HashStable)]
-    pub struct BoundVar { .. }
+    pub struct BoundVar {}
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, TyEncodable, TyDecodable)]
diff --git a/compiler/rustc_middle/src/ty/typeck_results.rs b/compiler/rustc_middle/src/ty/typeck_results.rs
@@ -611,7 +611,7 @@ rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "UserType({})"]
     pub struct UserTypeAnnotationIndex {
-        const START_INDEX = 0,
+        const START_INDEX = 0;
     }
 }
 
diff --git a/compiler/rustc_mir_build/src/build/mod.rs b/compiler/rustc_mir_build/src/build/mod.rs
@@ -372,7 +372,7 @@ struct CFG<'tcx> {
 }
 
 rustc_index::newtype_index! {
-    struct ScopeId { .. }
+    struct ScopeId {}
 }
 
 #[derive(Debug)]
diff --git a/compiler/rustc_mir_build/src/build/scope.rs b/compiler/rustc_mir_build/src/build/scope.rs
@@ -185,7 +185,7 @@ pub(crate) enum BreakableTarget {
 }
 
 rustc_index::newtype_index! {
-    struct DropIdx { .. }
+    struct DropIdx {}
 }
 
 const ROOT_NODE: DropIdx = DropIdx::from_u32(0);
diff --git a/compiler/rustc_mir_dataflow/src/move_paths/mod.rs b/compiler/rustc_mir_dataflow/src/move_paths/mod.rs
diff --git a/compiler/rustc_mir_transform/src/coverage/graph.rs b/compiler/rustc_mir_transform/src/coverage/graph.rs
diff --git a/compiler/rustc_passes/src/liveness.rs b/compiler/rustc_passes/src/liveness.rs
diff --git a/compiler/rustc_query_system/src/dep_graph/graph.rs b/compiler/rustc_query_system/src/dep_graph/graph.rs
diff --git a/compiler/rustc_query_system/src/dep_graph/serialized.rs b/compiler/rustc_query_system/src/dep_graph/serialized.rs
diff --git a/compiler/rustc_span/src/def_id.rs b/compiler/rustc_span/src/def_id.rs
diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
diff --git a/compiler/rustc_target/src/abi/mod.rs b/compiler/rustc_target/src/abi/mod.rs
diff --git a/compiler/rustc_type_ir/src/lib.rs b/compiler/rustc_type_ir/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -2556,8 +2556,7 @@ pub enum AttrStyle {`
`2556`	`2556`	`rustc_index::newtype_index! {`
`2557`	`2557`	`#[custom_encodable]`
`2558`	`2558`	`#[debug_format = "AttrId({})]"]`
`2559`		`- pub struct AttrId {`
`2560`		`- }`
	`2559`	`+ pub struct AttrId {}`
`2561`	`2560`	`}`
`2562`	`2561`
`2563`	`2562`	`impl<S: Encoder> Encodable<S> for AttrId {`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ rustc_index::newtype_index! {`
`9`	`9`	`///`
`10`	`10`	/// [`DefId`]: rustc_span::def_id::DefId
`11`	`11`	`#[debug_format = "NodeId({})"]`
`12`		`- pub struct NodeId {`
`13`		`- }`
	`12`	`+ pub struct NodeId {}`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`rustc_data_structures::define_id_collections!(NodeMap, NodeSet, NodeMapEntry, NodeId);`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,10 @@ impl<'tcx> fmt::Debug for OutlivesConstraint<'tcx> {`
`116`	`116`
`117`	`117`	`rustc_index::newtype_index! {`
`118`	`118`	`#[debug_format = "OutlivesConstraintIndex({})"]`
`119`		`- pub struct OutlivesConstraintIndex {`
`120`		`- }`
	`119`	`+ pub struct OutlivesConstraintIndex {}`
`121`	`120`	`}`
`122`	`121`
`123`	`122`	`rustc_index::newtype_index! {`
`124`	`123`	`#[debug_format = "ConstraintSccIndex({})"]`
`125`		`- pub struct ConstraintSccIndex {`
`126`		`- }`
	`124`	`+ pub struct ConstraintSccIndex {}`
`127`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,7 @@ impl_visitable! {`
`109`	`109`
`110`	`110`	`rustc_index::newtype_index! {`
`111`	`111`	`#[debug_format = "bw{}"]`
`112`		`- pub struct BorrowIndex {`
`113`		`- }`
	`112`	`+ pub struct BorrowIndex {}`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	/// `Borrows` stores the data used in the analyses that track the flow
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ pub struct LocationTable {`
`21`	`21`
`22`	`22`	`rustc_index::newtype_index! {`
`23`	`23`	`#[debug_format = "LocationIndex({})"]`
`24`		`- pub struct LocationIndex {`
`25`		`- }`
	`24`	`+ pub struct LocationIndex {}`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`#[derive(Copy, Clone, Debug)]`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ pub(crate) struct NllMemberConstraint<'tcx> {`
`56`	`56`
`57`	`57`	`rustc_index::newtype_index! {`
`58`	`58`	`#[debug_format = "MemberConstraintIndex({})"]`
`59`		`- pub(crate) struct NllMemberConstraintIndex {`
`60`		`- }`
	`59`	`+ pub(crate) struct NllMemberConstraintIndex {}`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`impl Default for MemberConstraintSet<'_, ty::RegionVid> {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct Appearance {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`rustc_index::newtype_index! {`
`49`		`- pub struct AppearanceIndex { .. }`
	`49`	`+ pub struct AppearanceIndex {}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`impl vll::LinkElem for Appearance {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ struct PreOrderFrame<Iter> {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`rustc_index::newtype_index! {`
`25`		`- struct PreorderIndex { .. }`
	`25`	`+ struct PreorderIndex {}`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`pub fn dominators<G: ControlFlowGraph>(graph: G) -> Dominators<G::Node> {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ rustc_index::newtype_index! {`
`138`	`138`	/// an "item-like" to something else can be implemented by a `Vec` instead of a
`139`	`139`	`/// tree or hash map.`
`140`	`140`	`#[derive(HashStable_Generic)]`
`141`		`- pub struct ItemLocalId { .. }`
	`141`	`+ pub struct ItemLocalId {}`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`impl ItemLocalId {`