Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

22 files changed, 7 insertions, 0 deletions

diff --git a/src/test/rustdoc/inline_cross/auxiliary/add-docs.rs b/tests/rustdoc/inline_cross/auxiliary/add-docs.rs
index 85efa508f..85efa508f 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/add-docs.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/add-docs.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs b/tests/rustdoc/inline_cross/auxiliary/assoc-items.rs
index 5fa299914..5fa299914 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/assoc-items.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/assoc-items.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs b/tests/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
index 6644c8e41..6644c8e41 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/assoc_item_trait_bounds.rs
diff --git a/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs b/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs
new file mode 100644
index 000000000..48672590a
--- /dev/null
+++ b/tests/rustdoc/inline_cross/auxiliary/cross-glob.rs
@@ -0,0 +1,7 @@
+#![crate_name = "inner"]
+
+pub struct SomeStruct;
+
+pub fn some_fn() {}
+
+pub enum Shadowed {}
diff --git a/src/test/rustdoc/inline_cross/auxiliary/default-trait-method.rs b/tests/rustdoc/inline_cross/auxiliary/default-trait-method.rs
index ce60bbfb4..ce60bbfb4 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/default-trait-method.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/default-trait-method.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/dyn_trait.rs b/tests/rustdoc/inline_cross/auxiliary/dyn_trait.rs
index 9ac2e3d96..9ac2e3d96 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/dyn_trait.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/dyn_trait.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs b/tests/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
index 401a6a44a..401a6a44a 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/impl-inline-without-trait.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs b/tests/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
index 19433c968..19433c968 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/impl_trait_aux.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/implementors_inline.rs b/tests/rustdoc/inline_cross/auxiliary/implementors_inline.rs
index b003fb357..b003fb357 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/implementors_inline.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/implementors_inline.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/issue-24183.rs b/tests/rustdoc/inline_cross/auxiliary/issue-24183.rs
index e7a13acc6..e7a13acc6 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/issue-24183.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/issue-24183.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs b/tests/rustdoc/inline_cross/auxiliary/issue-33113.rs
index 4e1f1918e..4e1f1918e 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/issue-33113.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/issue-33113.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs b/tests/rustdoc/inline_cross/auxiliary/macro-vis.rs
index 5615a4fdd..5615a4fdd 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/macro-vis.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/macro-vis.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/macros.rs b/tests/rustdoc/inline_cross/auxiliary/macros.rs
index 651ae2f1a..651ae2f1a 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/macros.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/macros.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs b/tests/rustdoc/inline_cross/auxiliary/proc_macro.rs
index d8e5746f3..d8e5746f3 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/proc_macro.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs b/tests/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
index 2e5290782..2e5290782 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/renamed-via-module.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
index 6357b76df..6357b76df 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden-sig.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
index 0c75b3127..0c75b3127 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-hidden.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
index 4e461d3bc..4e461d3bc 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-nonreachable-impls.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs b/tests/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
index 11d8733c4..11d8733c4 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/rustdoc-trait-object-impl.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/trait-vis.rs b/tests/rustdoc/inline_cross/auxiliary/trait-vis.rs
index e5bc7969b..e5bc7969b 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/trait-vis.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/trait-vis.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/use_crate.rs b/tests/rustdoc/inline_cross/auxiliary/use_crate.rs
index 75efbe0db..75efbe0db 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/use_crate.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/use_crate.rs
diff --git a/src/test/rustdoc/inline_cross/auxiliary/use_crate_2.rs b/tests/rustdoc/inline_cross/auxiliary/use_crate_2.rs
index 25b4c202e..25b4c202e 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/use_crate_2.rs
+++ b/tests/rustdoc/inline_cross/auxiliary/use_crate_2.rs