Unrolled build for rust-lang#121829

rust-timer · web-flow · commit cff564478123 · 2024-03-05T23:47:51.000-05:00
Rollup merge of rust-lang#121829 - nnethercote:dummy-tweaks-2, r=petrochenkov Dummy tweaks (attempt 2) r? `````@petrochenkov`````
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -1604,7 +1604,10 @@ pub fn noop_visit_capture_by<T: MutVisitor>(capture_by: &mut CaptureBy, vis: &mu
     }
 }
 
-/// Some value for the AST node that is valid but possibly meaningless.
+/// Some value for the AST node that is valid but possibly meaningless. Similar
+/// to `Default` but not intended for wide use. The value will never be used
+/// meaningfully, it exists just to support unwinding in `visit_clobber` in the
+/// case where its closure panics.
 pub trait DummyAstNode {
     fn dummy() -> Self;
 }
@@ -1679,19 +1682,6 @@ impl DummyAstNode for Stmt {
     }
 }
 
-impl DummyAstNode for Block {
-    fn dummy() -> Self {
-        Block {
-            stmts: Default::default(),
-            id: DUMMY_NODE_ID,
-            rules: BlockCheckMode::Default,
-            span: Default::default(),
-            tokens: Default::default(),
-            could_be_bare_literal: Default::default(),
-        }
-    }
-}
-
 impl DummyAstNode for Crate {
     fn dummy() -> Self {
         Crate {
diff --git a/compiler/rustc_expand/src/base.rs b/compiler/rustc_expand/src/base.rs
@@ -4,7 +4,6 @@ use crate::expand::{self, AstFragment, Invocation};
 use crate::module::DirOwnership;
 
 use rustc_ast::attr::MarkedAttrs;
-use rustc_ast::mut_visit::DummyAstNode;
 use rustc_ast::ptr::P;
 use rustc_ast::token::{self, Nonterminal};
 use rustc_ast::tokenstream::TokenStream;
@@ -582,6 +581,17 @@ impl DummyResult {
             tokens: None,
         })
     }
+
+    /// A plain dummy crate.
+    pub fn raw_crate() -> ast::Crate {
+        ast::Crate {
+            attrs: Default::default(),
+            items: Default::default(),
+            spans: Default::default(),
+            id: ast::DUMMY_NODE_ID,
+            is_placeholder: Default::default(),
+        }
+    }
 }
 
 impl MacResult for DummyResult {
@@ -650,7 +660,7 @@ impl MacResult for DummyResult {
     }
 
     fn make_crate(self: Box<DummyResult>) -> Option<ast::Crate> {
-        Some(DummyAstNode::dummy())
+        Some(DummyResult::raw_crate())
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1604,7 +1604,10 @@ pub fn noop_visit_capture_by<T: MutVisitor>(capture_by: &mut CaptureBy, vis: &mu`
`1604`	`1604`	`}`
`1605`	`1605`	`}`
`1606`	`1606`
`1607`		`-/// Some value for the AST node that is valid but possibly meaningless.`
	`1607`	`+/// Some value for the AST node that is valid but possibly meaningless. Similar`
	`1608`	+/// to `Default` but not intended for wide use. The value will never be used
	`1609`	+/// meaningfully, it exists just to support unwinding in `visit_clobber` in the
	`1610`	`+/// case where its closure panics.`
`1608`	`1611`	`pub trait DummyAstNode {`
`1609`	`1612`	`fn dummy() -> Self;`
`1610`	`1613`	`}`
`@@ -1679,19 +1682,6 @@ impl DummyAstNode for Stmt {`
`1679`	`1682`	`}`
`1680`	`1683`	`}`
`1681`	`1684`
`1682`		`-impl DummyAstNode for Block {`
`1683`		`- fn dummy() -> Self {`
`1684`		`- Block {`
`1685`		`- stmts: Default::default(),`
`1686`		`- id: DUMMY_NODE_ID,`
`1687`		`- rules: BlockCheckMode::Default,`
`1688`		`- span: Default::default(),`
`1689`		`- tokens: Default::default(),`
`1690`		`- could_be_bare_literal: Default::default(),`
`1691`		`- }`
`1692`		`- }`
`1693`		`-}`
`1694`		`-`
`1695`	`1685`	`impl DummyAstNode for Crate {`
`1696`	`1686`	`fn dummy() -> Self {`
`1697`	`1687`	`Crate {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ use crate::expand::{self, AstFragment, Invocation};`
`4`	`4`	`use crate::module::DirOwnership;`
`5`	`5`
`6`	`6`	`use rustc_ast::attr::MarkedAttrs;`
`7`		`-use rustc_ast::mut_visit::DummyAstNode;`
`8`	`7`	`use rustc_ast::ptr::P;`
`9`	`8`	`use rustc_ast::token::{self, Nonterminal};`
`10`	`9`	`use rustc_ast::tokenstream::TokenStream;`
`@@ -582,6 +581,17 @@ impl DummyResult {`
`582`	`581`	`tokens: None,`
`583`	`582`	`})`
`584`	`583`	`}`
	`584`	`+`
	`585`	`+ /// A plain dummy crate.`
	`586`	`+ pub fn raw_crate() -> ast::Crate {`
	`587`	`+ ast::Crate {`
	`588`	`+ attrs: Default::default(),`
	`589`	`+ items: Default::default(),`
	`590`	`+ spans: Default::default(),`
	`591`	`+ id: ast::DUMMY_NODE_ID,`
	`592`	`+ is_placeholder: Default::default(),`
	`593`	`+ }`
	`594`	`+ }`
`585`	`595`	`}`
`586`	`596`
`587`	`597`	`impl MacResult for DummyResult {`
`@@ -650,7 +660,7 @@ impl MacResult for DummyResult {`
`650`	`660`	`}`
`651`	`661`
`652`	`662`	`fn make_crate(self: Box<DummyResult>) -> Option<ast::Crate> {`
`653`		`- Some(DummyAstNode::dummy())`
	`663`	`+ Some(DummyResult::raw_crate())`
`654`	`664`	`}`
`655`	`665`	`}`
`656`	`666`