Auto merge of #140695 - Zalathar:rollup-i32gzbo, r=Zalathar

Rollup of 12 pull requests

Successful merges:

 - #139550 (Fix `-Zremap-path-scope` rmeta handling)
 - #139764 (Consistent trait bounds for ExtractIf Debug impls)
 - #139773 (Implement `Iterator::last` for `vec::IntoIter`)
 - #140035 (Implement RFC 3503: frontmatters)
 - #140251 (coverage-dump: Resolve global file IDs to filenames)
 - #140393 (std: get rid of `sys_common::process`)
 - #140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate)
 - #140598 (Steer docs to `utf8_chunks` and `Iterator::take`)
 - #140634 (Use more accurate ELF flags on MIPS)
 - #140673 (Clean rustdoc tests folder)
 - #140678 (Be a bit more relaxed about not yet constrained infer vars in closure upvar analysis)
 - #140687 (Update mdbook to 0.4.49)

r? `@ghost`
`@rustbot` modify labels: rollup

1 files changed, 54 insertions, 0 deletions

diff --git a/tests/rustdoc/macro/const-rendering-macros-33302.rs b/tests/rustdoc/macro/const-rendering-macros-33302.rs
new file mode 100644
index 00000000000..9fd45df08be
--- /dev/null
+++ b/tests/rustdoc/macro/const-rendering-macros-33302.rs
@@ -0,0 +1,54 @@
+// https://github.com/rust-lang/rust/issues/33302
+#![crate_name="issue_33302"]
+
+// Ensure constant and array length values are not taken from source
+// code, which wreaks havoc with macros.
+
+macro_rules! make {
+    ($n:expr) => {
+        pub struct S;
+
+        //@ has issue_33302/constant.CST.html \
+        //        '//pre[@class="rust item-decl"]' 'pub const CST: i32'
+        pub const CST: i32 = ($n * $n);
+        //@ has issue_33302/static.ST.html \
+        //        '//pre[@class="rust item-decl"]' 'pub static ST: i32'
+        pub static ST: i32 = ($n * $n);
+
+        pub trait T<X> {
+            fn ignore(_: &X) {}
+            const C: X;
+            //@ has issue_33302/trait.T.html \
+            //        '//pre[@class="rust item-decl"]' 'const D: i32'
+            //@ has - '//*[@id="associatedconstant.D"]' 'const D: i32'
+            const D: i32 = ($n * $n);
+        }
+
+        //@ has issue_33302/struct.S.html \
+        //        '//*[@class="impl"]' 'impl T<[i32; 16]> for S'
+        //@ has - '//*[@id="associatedconstant.C"]' 'const C: [i32; 16]'
+        //@ has - '//*[@id="associatedconstant.D"]' 'const D: i32'
+        impl T<[i32; ($n * $n)]> for S {
+            const C: [i32; ($n * $n)] = [0; ($n * $n)];
+        }
+
+        //@ has issue_33302/struct.S.html \
+        //        '//*[@class="impl"]' 'impl T<[i32; 16]> for S'
+        //@ has - '//*[@id="associatedconstant.C-1"]' 'const C: (i32,)'
+        //@ has - '//*[@id="associatedconstant.D-1"]' 'const D: i32'
+        impl T<(i32,)> for S {
+            const C: (i32,) = ($n,);
+        }
+
+        //@ has issue_33302/struct.S.html \
+        //        '//*[@class="impl"]' 'impl T<(i32, i32)> for S'
+        //@ has - '//*[@id="associatedconstant.C-2"]' 'const C: (i32, i32)'
+        //@ has - '//*[@id="associatedconstant.D-2"]' 'const D: i32'
+        impl T<(i32, i32)> for S {
+            const C: (i32, i32) = ($n, $n);
+            const D: i32 = ($n / $n);
+        }
+    };
+}
+
+make!(4);