Reorder fields to visit NodeId first.

Author: cjgillot

compiler/rustc_ast/src/ast.rs

@@ -554,12 +554,12 @@ pub struct WhereEqPredicate {
 
 #[derive(Clone, Encodable, Decodable, Debug, Walkable)]
 pub struct Crate {
-    pub attrs: AttrVec,
-    pub items: ThinVec<P<Item>>,
-    pub spans: ModSpans,
     /// Must be equal to `CRATE_NODE_ID` after the crate root is expanded, but may hold
     /// expansion placeholders or an unassigned value (`DUMMY_NODE_ID`) before that.
     pub id: NodeId,
+    pub attrs: AttrVec,
+    pub items: ThinVec<P<Item>>,
+    pub spans: ModSpans,
     pub is_placeholder: bool,
 }
 
@@ -2278,7 +2278,7 @@ pub struct MutTy {
 
 /// Represents a function's signature in a trait declaration,
 /// trait implementation, or free function.
-#[derive(Clone, Encodable, Decodable, Debug, Walkable)]
+#[derive(Clone, Encodable, Decodable, Debug)]
 pub struct FnSig {
     pub header: FnHeader,
     pub decl: P<FnDecl>,
@@ -3778,7 +3778,7 @@ pub struct FnContract {
     pub ensures: Option<P<Expr>>,
 }
 
-#[derive(Clone, Encodable, Decodable, Debug, Walkable)]
+#[derive(Clone, Encodable, Decodable, Debug)]
 pub struct Fn {
     pub defaultness: Defaultness,
     pub ident: Ident,

compiler/rustc_ast/src/visit.rs

@@ -521,8 +521,6 @@ macro_rules! common_visitor_and_walkers {
             DelimSpan,
             EnumDef,
             Extern,
-            Fn,
-            FnSig,
             ForLoopKind,
             FormatArgPosition,
             FormatArgsPiece,
@@ -1005,8 +1003,13 @@ macro_rules! common_visitor_and_walkers {
                     // Visibility is visited as a part of the item.
                     _vis,
                     Fn { defaultness, ident, sig, generics, contract, body, define_opaque },
-                ) =>
-                    visit_visitable!($($mut)? vis, defaultness, ident, sig, generics, contract, body, define_opaque),
+                ) => {
+                    let FnSig { header, decl, span } = sig;
+                    visit_visitable!($($mut)? vis,
+                        defaultness, ident, header, generics, decl,
+                        contract, body, span, define_opaque
+                    )
+                }
                 FnKind::Closure(binder, coroutine_kind, decl, body) =>
                     visit_visitable!($($mut)? vis, binder, coroutine_kind, decl, body),
             }

tests/ui/asm/inline-syntax.x86_64.stderr

@@ -1,10 +1,16 @@
+warning: avoid using `.intel_syntax`, Intel syntax is the default
+  --> $DIR/inline-syntax.rs:47:14
+   |
+LL | global_asm!(".intel_syntax noprefix", "nop");
+   |              ^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(bad_asm_style)]` on by default
+
 warning: avoid using `.intel_syntax`, Intel syntax is the default
   --> $DIR/inline-syntax.rs:21:15
    |
 LL |         asm!(".intel_syntax noprefix", "nop");
    |               ^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(bad_asm_style)]` on by default
 
 warning: avoid using `.intel_syntax`, Intel syntax is the default
   --> $DIR/inline-syntax.rs:24:15
@@ -36,11 +42,5 @@ warning: avoid using `.intel_syntax`, Intel syntax is the default
 LL |             .intel_syntax noprefix
    |             ^^^^^^^^^^^^^^^^^^^^^^
 
-warning: avoid using `.intel_syntax`, Intel syntax is the default
-  --> $DIR/inline-syntax.rs:47:14
-   |
-LL | global_asm!(".intel_syntax noprefix", "nop");
-   |              ^^^^^^^^^^^^^^^^^^^^^^
-
 warning: 7 warnings emitted
 

tests/ui/attributes/key-value-expansion-scope.stderr

@@ -126,6 +126,27 @@ LL |     #![doc = in_block!()]
    |
    = help: have you added the `#[macro_use]` on the module/import?
 
+warning: cannot find macro `in_root` in the current scope when looking from the crate root
+  --> $DIR/key-value-expansion-scope.rs:1:10
+   |
+LL | #![doc = in_root!()]
+   |          ^^^^^^^ not found from the crate root
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
+   = help: import `macro_rules` with `use` to make it callable above its definition
+   = note: `#[warn(out_of_scope_macro_calls)]` on by default
+
+warning: cannot find macro `in_mod_escape` in the current scope when looking from the crate root
+  --> $DIR/key-value-expansion-scope.rs:4:10
+   |
+LL | #![doc = in_mod_escape!()]
+   |          ^^^^^^^^^^^^^ not found from the crate root
+   |
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
+   = help: import `macro_rules` with `use` to make it callable above its definition
+
 warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
   --> $DIR/key-value-expansion-scope.rs:21:9
    |
@@ -135,7 +156,6 @@ LL | #[doc = in_mod!()]
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
-   = note: `#[warn(out_of_scope_macro_calls)]` on by default
 
 warning: cannot find macro `in_mod` in the current scope when looking from module `macros_stay`
   --> $DIR/key-value-expansion-scope.rs:24:14
@@ -167,25 +187,5 @@ LL |     #![doc = in_mod_escape!()]
    = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
    = help: import `macro_rules` with `use` to make it callable above its definition
 
-warning: cannot find macro `in_root` in the current scope when looking from the crate root
-  --> $DIR/key-value-expansion-scope.rs:1:10
-   |
-LL | #![doc = in_root!()]
-   |          ^^^^^^^ not found from the crate root
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
-   = help: import `macro_rules` with `use` to make it callable above its definition
-
-warning: cannot find macro `in_mod_escape` in the current scope when looking from the crate root
-  --> $DIR/key-value-expansion-scope.rs:4:10
-   |
-LL | #![doc = in_mod_escape!()]
-   |          ^^^^^^^^^^^^^ not found from the crate root
-   |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #124535 <https://github.com/rust-lang/rust/issues/124535>
-   = help: import `macro_rules` with `use` to make it callable above its definition
-
 error: aborting due to 16 previous errors; 6 warnings emitted
 

tests/ui/cfg/cfg-version/syntax.stderr

@@ -95,32 +95,32 @@ LL |     assert!(cfg!(version("1.20.0-stable")));
    |                          ^^^^^^^^^^^^^^^
 
 warning: unexpected `cfg` condition name: `version`
-  --> $DIR/syntax.rs:130:18
+  --> $DIR/syntax.rs:30:7
    |
-LL |     assert!(cfg!(version = "1.43"));
-   |                  ^^^^^^^^^^^^^^^^
+LL | #[cfg(version = "1.43")]
+   |       ^^^^^^^^^^^^^^^^
    |
    = help: to expect this configuration use `--check-cfg=cfg(version, values("1.43"))`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
    = note: `#[warn(unexpected_cfgs)]` on by default
 help: there is a similar config predicate: `version("..")`
    |
-LL -     assert!(cfg!(version = "1.43"));
-LL +     assert!(cfg!(version("1.43")));
+LL - #[cfg(version = "1.43")]
+LL + #[cfg(version("1.43"))]
    |
 
 warning: unexpected `cfg` condition name: `version`
-  --> $DIR/syntax.rs:30:7
+  --> $DIR/syntax.rs:130:18
    |
-LL | #[cfg(version = "1.43")]
-   |       ^^^^^^^^^^^^^^^^
+LL |     assert!(cfg!(version = "1.43"));
+   |                  ^^^^^^^^^^^^^^^^
    |
    = help: to expect this configuration use `--check-cfg=cfg(version, values("1.43"))`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
 help: there is a similar config predicate: `version("..")`
    |
-LL - #[cfg(version = "1.43")]
-LL + #[cfg(version("1.43"))]
+LL -     assert!(cfg!(version = "1.43"));
+LL +     assert!(cfg!(version("1.43")));
    |
 
 error[E0425]: cannot find function `key_value_form` in this scope

tests/ui/check-cfg/mix.stderr

@@ -1,3 +1,53 @@
+warning: unexpected `cfg` condition name: `widnows`
+  --> $DIR/mix.rs:13:7
+   |
+LL | #[cfg(widnows)]
+   |       ^^^^^^^ help: there is a config with a similar name: `windows`
+   |
+   = help: to expect this configuration use `--check-cfg=cfg(widnows)`
+   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+   = note: `#[warn(unexpected_cfgs)]` on by default
+
+warning: unexpected `cfg` condition value: (none)
+  --> $DIR/mix.rs:17:7
+   |
+LL | #[cfg(feature)]
+   |       ^^^^^^^- help: specify a config value: `= "foo"`
+   |
+   = note: expected values for `feature` are: `foo`
+   = help: to expect this configuration use `--check-cfg=cfg(feature)`
+   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+
+warning: unexpected `cfg` condition value: `bar`
+  --> $DIR/mix.rs:24:7
+   |
+LL | #[cfg(feature = "bar")]
+   |       ^^^^^^^^^^^^^^^
+   |
+   = note: expected values for `feature` are: `foo`
+   = help: to expect this configuration use `--check-cfg=cfg(feature, values("bar"))`
+   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+
+warning: unexpected `cfg` condition value: `zebra`
+  --> $DIR/mix.rs:28:7
+   |
+LL | #[cfg(feature = "zebra")]
+   |       ^^^^^^^^^^^^^^^^^
+   |
+   = note: expected values for `feature` are: `foo`
+   = help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
+   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+
+warning: unexpected `cfg` condition name: `uu`
+  --> $DIR/mix.rs:32:12
+   |
+LL | #[cfg_attr(uu, unix)]
+   |            ^^
+   |
+   = help: expected names are: `feature` and 31 more
+   = help: to expect this configuration use `--check-cfg=cfg(uu)`
+   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+
 warning: unexpected `cfg` condition name: `widnows`
   --> $DIR/mix.rs:41:10
    |
@@ -6,7 +56,6 @@ LL |     cfg!(widnows);
    |
    = help: to expect this configuration use `--check-cfg=cfg(widnows)`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-   = note: `#[warn(unexpected_cfgs)]` on by default
 
 warning: unexpected `cfg` condition value: `bar`
   --> $DIR/mix.rs:44:10
@@ -34,7 +83,6 @@ warning: unexpected `cfg` condition name: `xxx`
 LL |     cfg!(xxx = "foo");
    |          ^^^^^^^^^^^
    |
-   = help: expected names are: `feature` and 31 more
    = help: to expect this configuration use `--check-cfg=cfg(xxx, values("foo"))`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
 
@@ -197,53 +245,5 @@ LL |     cfg!(all(feature = "zebra", feature = "zebra", feature = "zebra"));
    = help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
    = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
 
-warning: unexpected `cfg` condition name: `widnows`
-  --> $DIR/mix.rs:13:7
-   |
-LL | #[cfg(widnows)]
-   |       ^^^^^^^ help: there is a config with a similar name: `windows`
-   |
-   = help: to expect this configuration use `--check-cfg=cfg(widnows)`
-   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-
-warning: unexpected `cfg` condition value: (none)
-  --> $DIR/mix.rs:17:7
-   |
-LL | #[cfg(feature)]
-   |       ^^^^^^^- help: specify a config value: `= "foo"`
-   |
-   = note: expected values for `feature` are: `foo`
-   = help: to expect this configuration use `--check-cfg=cfg(feature)`
-   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-
-warning: unexpected `cfg` condition value: `bar`
-  --> $DIR/mix.rs:24:7
-   |
-LL | #[cfg(feature = "bar")]
-   |       ^^^^^^^^^^^^^^^
-   |
-   = note: expected values for `feature` are: `foo`
-   = help: to expect this configuration use `--check-cfg=cfg(feature, values("bar"))`
-   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-
-warning: unexpected `cfg` condition value: `zebra`
-  --> $DIR/mix.rs:28:7
-   |
-LL | #[cfg(feature = "zebra")]
-   |       ^^^^^^^^^^^^^^^^^
-   |
-   = note: expected values for `feature` are: `foo`
-   = help: to expect this configuration use `--check-cfg=cfg(feature, values("zebra"))`
-   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-
-warning: unexpected `cfg` condition name: `uu`
-  --> $DIR/mix.rs:32:12
-   |
-LL | #[cfg_attr(uu, unix)]
-   |            ^^
-   |
-   = help: to expect this configuration use `--check-cfg=cfg(uu)`
-   = note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
-
 warning: 26 warnings emitted
 

tests/ui/coroutine/print/coroutine-print-verbose-1.stderr

@@ -33,7 +33,7 @@ note: required because it's used within this coroutine
    |
 LL |     #[coroutine] || {
    |                  ^^
-note: required because it appears within the type `Opaque(DefId(0:28 ~ coroutine_print_verbose_1[75fb]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
+note: required because it appears within the type `Opaque(DefId(0:29 ~ coroutine_print_verbose_1[75fb]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
   --> $DIR/coroutine-print-verbose-1.rs:41:30
    |
 LL | pub fn make_gen2<T>(t: T) -> impl Coroutine<Return = T> {

tests/ui/impl-trait/precise-capturing/illegal-positions.real.stderr

@@ -16,12 +16,6 @@ error: `use<...>` precise capturing syntax not allowed in bounds
 LL |     type Assoc: use<> where (): use<>;
    |                 ^^^^^
 
-error: at least one trait must be specified
-  --> $DIR/illegal-positions.rs:14:21
-   |
-LL | fn fun<T: use<>>(_: impl use<>) where (): use<> {}
-   |                     ^^^^^^^^^^
-
 error: `use<...>` precise capturing syntax not allowed in bounds
   --> $DIR/illegal-positions.rs:14:11
    |
@@ -34,6 +28,12 @@ error: `use<...>` precise capturing syntax not allowed in bounds
 LL | fn fun<T: use<>>(_: impl use<>) where (): use<> {}
    |                                           ^^^^^
 
+error: at least one trait must be specified
+  --> $DIR/illegal-positions.rs:14:21
+   |
+LL | fn fun<T: use<>>(_: impl use<>) where (): use<> {}
+   |                     ^^^^^^^^^^
+
 error: `use<...>` precise capturing syntax not allowed in `dyn` trait object bounds
   --> $DIR/illegal-positions.rs:21:25
    |

tests/ui/lint/unused/useless-comment.stderr

@@ -1,3 +1,16 @@
+error: unused doc comment
+  --> $DIR/useless-comment.rs:9:1
+   |
+LL | /// foo
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rustdoc does not generate documentation for macro invocations
+   |
+   = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
+note: the lint level is defined here
+  --> $DIR/useless-comment.rs:3:9
+   |
+LL | #![deny(unused_doc_comments)]
+   |         ^^^^^^^^^^^^^^^^^^^
+
 error: unused doc comment
   --> $DIR/useless-comment.rs:12:1
    |
@@ -8,11 +21,6 @@ LL | unsafe extern "C" { }
    | --------------------- rustdoc does not generate documentation for extern blocks
    |
    = help: use `//` for a plain comment
-note: the lint level is defined here
-  --> $DIR/useless-comment.rs:3:9
-   |
-LL | #![deny(unused_doc_comments)]
-   |         ^^^^^^^^^^^^^^^^^^^
 
 error: unused doc comment
   --> $DIR/useless-comment.rs:13:1
@@ -151,13 +159,5 @@ LL | |     }
    |
    = help: use `//` for a plain comment
 
-error: unused doc comment
-  --> $DIR/useless-comment.rs:9:1
-   |
-LL | /// foo
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rustdoc does not generate documentation for macro invocations
-   |
-   = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
-
 error: aborting due to 15 previous errors