A few small cleanups for newtype_index

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.

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 {

compiler/rustc_ast/src/node_id.rs

@@ -9,8 +9,7 @@
     ///
     /// [`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);

compiler/rustc_borrowck/src/constraints/mod.rs

@@ -116,12 +116,10 @@ fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
 
 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 {}
 }

compiler/rustc_borrowck/src/dataflow.rs

@@ -109,8 +109,7 @@ fn reconstruct_terminator_effect(
 
 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

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)]

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> {

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 {

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> {

compiler/rustc_hir/src/hir_id.rs

@@ -138,7 +138,7 @@ fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
     /// 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 {

compiler/rustc_hir_analysis/src/coherence/inherent_impls_overlap.rs

@@ -199,9 +199,9 @@ fn check_item(&mut self, id: hir::ItemId) {
 
             rustc_index::newtype_index! {
                 #[custom_encodable]
-                pub struct RegionId {
-                }
+                pub struct RegionId {}
             }
+
             struct ConnectedRegion {
                 idents: SmallVec<[Symbol; 8]>,
                 impl_blocks: FxHashSet<usize>,

compiler/rustc_hir_typeck/src/fn_ctxt/arg_matrix.rs

@@ -5,14 +5,12 @@
 
 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 {

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.

compiler/rustc_index/src/vec/tests.rs

@@ -5,7 +5,7 @@
 
 rustc_macros::newtype_index! {
     #[max = 0xFFFF_FFFA]
-    struct MyIdx { }
+    struct MyIdx {}
 }
 
 #[test]

compiler/rustc_infer/src/infer/region_constraints/leak_check.rs

@@ -358,14 +358,12 @@ fn take_min(&mut self, universe: ty::UniverseIndex, region: ty::Region<'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

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;
     }
 }
 

compiler/rustc_macros/src/newtype.rs

@@ -25,14 +25,6 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
         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 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
             _ => 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 =

compiler/rustc_middle/src/middle/region.rs

@@ -148,8 +148,7 @@ pub enum ScopeData {
     /// * 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`

compiler/rustc_middle/src/mir/coverage.rs

@@ -35,8 +35,7 @@ impl ExpressionOperandId {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "CounterValueReference({})"]
-    pub struct CounterValueReference {
-    }
+    pub struct CounterValueReference {}
 }
 
 impl CounterValueReference {
@@ -59,8 +58,7 @@ pub fn zero_based_index(self) -> u32 {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "InjectedExpressionId({})"]
-    pub struct InjectedExpressionId {
-    }
+    pub struct InjectedExpressionId {}
 }
 
 rustc_index::newtype_index! {
@@ -70,8 +68,7 @@ pub struct InjectedExpressionId {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "InjectedExpressionIndex({})"]
-    pub struct InjectedExpressionIndex {
-    }
+    pub struct InjectedExpressionIndex {}
 }
 
 rustc_index::newtype_index! {
@@ -81,8 +78,7 @@ pub struct InjectedExpressionIndex {
     #[derive(HashStable)]
     #[max = 0xFFFF_FFFF]
     #[debug_format = "MappedExpressionIndex({})"]
-    pub struct MappedExpressionIndex {
-    }
+    pub struct MappedExpressionIndex {}
 }
 
 impl From<CounterValueReference> for ExpressionOperandId {

compiler/rustc_middle/src/mir/mod.rs

@@ -657,7 +657,7 @@ pub fn outermost(span: Span) -> Self {
     #[derive(HashStable)]
     #[debug_format = "_{}"]
     pub struct Local {
-        const RETURN_PLACE = 0,
+        const RETURN_PLACE = 0;
     }
 }
 
@@ -1149,7 +1149,7 @@ pub struct VarDebugInfo<'tcx> {
     #[derive(HashStable)]
     #[debug_format = "bb{}"]
     pub struct BasicBlock {
-        const START_BLOCK = 0,
+        const START_BLOCK = 0;
     }
 }
 
@@ -1532,8 +1532,7 @@ pub fn is_field_to(&self, f: Field) -> bool {
     /// [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 @@ fn fmt(&self, fmt: &mut Formatter<'_>) -> fmt::Result {
     #[derive(HashStable)]
     #[debug_format = "scope[{}]"]
     pub struct SourceScope {
-        const OUTERMOST_SOURCE_SCOPE = 0,
+        const OUTERMOST_SOURCE_SCOPE = 0;
     }
 }
 
@@ -2757,8 +2756,7 @@ fn visit_with<Vs: TypeVisitor<'tcx>>(&self, visitor: &mut Vs) -> ControlFlow<Vs:
 rustc_index::newtype_index! {
     #[derive(HashStable)]
     #[debug_format = "promoted[{}]"]
-    pub struct Promoted {
-    }
+    pub struct Promoted {}
 }
 
 impl<'tcx> Debug for Constant<'tcx> {

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.

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 {}
             }
         )*
 

compiler/rustc_middle/src/ty/sty.rs

@@ -1379,8 +1379,7 @@ pub struct ConstVid<'tcx> {
     /// 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 @@ fn index(self) -> usize {
 
 rustc_index::newtype_index! {
     #[derive(HashStable)]
-    pub struct BoundVar { .. }
+    pub struct BoundVar {}
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, TyEncodable, TyDecodable)]

compiler/rustc_middle/src/ty/typeck_results.rs

@@ -611,7 +611,7 @@ pub fn remove(&mut self, id: hir::HirId) -> Option<V> {
     #[derive(HashStable)]
     #[debug_format = "UserType({})"]
     pub struct UserTypeAnnotationIndex {
-        const START_INDEX = 0,
+        const START_INDEX = 0;
     }
 }
 

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)]

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);

compiler/rustc_mir_dataflow/src/move_paths/mod.rs

@@ -15,8 +15,7 @@
 
 rustc_index::newtype_index! {
     #[debug_format = "mp{}"]
-    pub struct MovePathIndex {
-    }
+    pub struct MovePathIndex {}
 }
 
 impl polonius_engine::Atom for MovePathIndex {
@@ -27,14 +26,12 @@ fn index(self) -> usize {
 
 rustc_index::newtype_index! {
     #[debug_format = "mo{}"]
-    pub struct MoveOutIndex {
-    }
+    pub struct MoveOutIndex {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "in{}"]
-    pub struct InitIndex {
-    }
+    pub struct InitIndex {}
 }
 
 impl MoveOutIndex {

compiler/rustc_mir_transform/src/coverage/graph.rs

@@ -284,7 +284,7 @@ fn predecessors(&self, node: Self::Node) -> <Self as graph::GraphPredecessors<'_
     /// A node in the control-flow graph of CoverageGraph.
     #[debug_format = "bcb{}"]
     pub(super) struct BasicCoverageBlock {
-        const START_BCB = 0,
+        const START_BCB = 0;
     }
 }
 

compiler/rustc_passes/src/liveness.rs

@@ -109,14 +109,12 @@
 
 rustc_index::newtype_index! {
     #[debug_format = "v({})"]
-    pub struct Variable {
-    }
+    pub struct Variable {}
 }
 
 rustc_index::newtype_index! {
     #[debug_format = "ln({})"]
-    pub struct LiveNode {
-    }
+    pub struct LiveNode {}
 }
 
 #[derive(Copy, Clone, PartialEq, Debug)]

compiler/rustc_query_system/src/dep_graph/graph.rs

@@ -37,7 +37,7 @@ pub struct DepGraph<K: DepKind> {
 }
 
 rustc_index::newtype_index! {
-    pub struct DepNodeIndex { .. }
+    pub struct DepNodeIndex {}
 }
 
 impl DepNodeIndex {
@@ -974,7 +974,7 @@ pub struct WorkProduct {
 
 // Index type for `DepNodeData`'s edges.
 rustc_index::newtype_index! {
-    struct EdgeIndex { .. }
+    struct EdgeIndex {}
 }
 
 /// `CurrentDepGraph` stores the dependency graph for the current session. It

compiler/rustc_query_system/src/dep_graph/serialized.rs

@@ -28,8 +28,7 @@
 // and use those bits to encode which index type it contains.
 rustc_index::newtype_index! {
     #[max = 0x7FFF_FFFF]
-    pub struct SerializedDepNodeIndex {
-    }
+    pub struct SerializedDepNodeIndex {}
 }
 
 /// Data for use when recompiling the **current crate**.

compiler/rustc_span/src/def_id.rs

@@ -12,8 +12,7 @@
 rustc_index::newtype_index! {
     #[custom_encodable]
     #[debug_format = "crate{}"]
-    pub struct CrateNum {
-    }
+    pub struct CrateNum {}
 }
 
 /// Item definitions in the currently-compiled crate would have the `CrateNum`
@@ -199,7 +198,7 @@ pub fn new(crate_name: Symbol, is_exe: bool, mut metadata: Vec<String>) -> Stabl
     pub struct DefIndex {
         /// The crate root is always assigned index 0 by the AST Map code,
         /// thanks to `NodeCollector::new`.
-        const CRATE_DEF_INDEX = 0,
+        const CRATE_DEF_INDEX = 0;
     }
 }
 

compiler/rustc_span/src/hygiene.rs

@@ -62,8 +62,7 @@ pub struct SyntaxContextData {
 rustc_index::newtype_index! {
     /// A unique ID associated with a macro invocation and expansion.
     #[custom_encodable]
-    pub struct ExpnIndex {
-    }
+    pub struct ExpnIndex {}
 }
 
 /// A unique ID associated with a macro invocation and expansion.
@@ -85,8 +84,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     #[custom_encodable]
     #[no_ord_impl]
     #[debug_format = "expn{}"]
-    pub struct LocalExpnId {
-    }
+    pub struct LocalExpnId {}
 }
 
 // To ensure correctness of incremental compilation,

compiler/rustc_span/src/symbol.rs

@@ -1801,7 +1801,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 pub struct Symbol(SymbolIndex);
 
 rustc_index::newtype_index! {
-    struct SymbolIndex { .. }
+    struct SymbolIndex {}
 }
 
 impl Symbol {

compiler/rustc_target/src/abi/mod.rs

@@ -21,8 +21,7 @@ fn to_json(&self) -> Json {
 
 rustc_index::newtype_index! {
     #[derive(HashStable_Generic)]
-    pub struct VariantIdx {
-    }
+    pub struct VariantIdx {}
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, HashStable_Generic)]

compiler/rustc_type_ir/src/lib.rs

@@ -303,7 +303,7 @@ pub struct TypeFlags: u32 {
     #[derive(HashStable_Generic)]
     #[debug_format = "DebruijnIndex({})"]
     pub struct DebruijnIndex {
-        const INNERMOST = 0,
+        const INNERMOST = 0;
     }
 }
 
@@ -500,8 +500,7 @@ pub enum IntVarValue {
 rustc_index::newtype_index! {
     /// A **ty**pe **v**ariable **ID**.
     #[debug_format = "_#{}t"]
-    pub struct TyVid {
-    }
+    pub struct TyVid {}
 }
 
 /// An **int**egral (`u32`, `i32`, `usize`, etc.) type **v**ariable **ID**.
@@ -789,8 +788,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     /// use for checking generic functions.
     #[derive(HashStable_Generic)]
     #[debug_format = "U{}"]
-    pub struct UniverseIndex {
-    }
+    pub struct UniverseIndex {}
 }
 
 impl UniverseIndex {