Merging upstream version 1.68.2+dfsg1.

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

35 files changed, 1 insertions, 1 deletions

diff --git a/src/test/ui/cfg/assume-incomplete-release/assume-incomplete.rs b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
index 24d2dc645..24d2dc645 100644
--- a/src/test/ui/cfg/assume-incomplete-release/assume-incomplete.rs
+++ b/tests/ui/cfg/assume-incomplete-release/assume-incomplete.rs
diff --git a/src/test/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
index 678752702..067c620f5 100644
--- a/src/test/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
+++ b/tests/ui/cfg/assume-incomplete-release/auxiliary/ver-cfg-rel.rs
@@ -8,7 +8,7 @@ use proc_macro::{TokenStream, TokenTree as Tt};
 use std::str::FromStr;
 
 // String containing the current version number of the tip, i.e. "1.41.2"
-static VERSION_NUMBER: &str = include_str!("../../../../../version");
+static VERSION_NUMBER: &str = include_str!("../../../../../src/version");
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 struct Version {
diff --git a/src/test/ui/cfg/auxiliary/cfg_inner_static.rs b/tests/ui/cfg/auxiliary/cfg_inner_static.rs
index 6a619a4e7..6a619a4e7 100644
--- a/src/test/ui/cfg/auxiliary/cfg_inner_static.rs
+++ b/tests/ui/cfg/auxiliary/cfg_inner_static.rs
diff --git a/src/test/ui/cfg/cfg-attr-cfg.rs b/tests/ui/cfg/cfg-attr-cfg.rs
index 61794e0bf..61794e0bf 100644
--- a/src/test/ui/cfg/cfg-attr-cfg.rs
+++ b/tests/ui/cfg/cfg-attr-cfg.rs
diff --git a/src/test/ui/cfg/cfg-attr-crate.rs b/tests/ui/cfg/cfg-attr-crate.rs
index 1d70f2f84..1d70f2f84 100644
--- a/src/test/ui/cfg/cfg-attr-crate.rs
+++ b/tests/ui/cfg/cfg-attr-crate.rs
diff --git a/src/test/ui/cfg/cfg-family.rs b/tests/ui/cfg/cfg-family.rs
index c7d196a2a..c7d196a2a 100644
--- a/src/test/ui/cfg/cfg-family.rs
+++ b/tests/ui/cfg/cfg-family.rs
diff --git a/src/test/ui/cfg/cfg-in-crate-1.rs b/tests/ui/cfg/cfg-in-crate-1.rs
index e84300aa3..e84300aa3 100644
--- a/src/test/ui/cfg/cfg-in-crate-1.rs
+++ b/tests/ui/cfg/cfg-in-crate-1.rs
diff --git a/src/test/ui/cfg/cfg-macros-foo.rs b/tests/ui/cfg/cfg-macros-foo.rs
index 8b112c796..8b112c796 100644
--- a/src/test/ui/cfg/cfg-macros-foo.rs
+++ b/tests/ui/cfg/cfg-macros-foo.rs
diff --git a/src/test/ui/cfg/cfg-macros-notfoo.rs b/tests/ui/cfg/cfg-macros-notfoo.rs
index 292d97821..292d97821 100644
--- a/src/test/ui/cfg/cfg-macros-notfoo.rs
+++ b/tests/ui/cfg/cfg-macros-notfoo.rs
diff --git a/src/test/ui/cfg/cfg-match-arm.rs b/tests/ui/cfg/cfg-match-arm.rs
index 071008f9e..071008f9e 100644
--- a/src/test/ui/cfg/cfg-match-arm.rs
+++ b/tests/ui/cfg/cfg-match-arm.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver-ok.rs b/tests/ui/cfg/cfg-method-receiver-ok.rs
index 61ad3b8c1..61ad3b8c1 100644
--- a/src/test/ui/cfg/cfg-method-receiver-ok.rs
+++ b/tests/ui/cfg/cfg-method-receiver-ok.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver.rs b/tests/ui/cfg/cfg-method-receiver.rs
index 71134ff17..71134ff17 100644
--- a/src/test/ui/cfg/cfg-method-receiver.rs
+++ b/tests/ui/cfg/cfg-method-receiver.rs
diff --git a/src/test/ui/cfg/cfg-method-receiver.stderr b/tests/ui/cfg/cfg-method-receiver.stderr
index 5767a7c1b..5767a7c1b 100644
--- a/src/test/ui/cfg/cfg-method-receiver.stderr
+++ b/tests/ui/cfg/cfg-method-receiver.stderr
diff --git a/src/test/ui/cfg/cfg-panic-abort.rs b/tests/ui/cfg/cfg-panic-abort.rs
index 3853b598a..3853b598a 100644
--- a/src/test/ui/cfg/cfg-panic-abort.rs
+++ b/tests/ui/cfg/cfg-panic-abort.rs
diff --git a/src/test/ui/cfg/cfg-panic.rs b/tests/ui/cfg/cfg-panic.rs
index 2de72d54a..2de72d54a 100644
--- a/src/test/ui/cfg/cfg-panic.rs
+++ b/tests/ui/cfg/cfg-panic.rs
diff --git a/src/test/ui/cfg/cfg-path-error.rs b/tests/ui/cfg/cfg-path-error.rs
index 5bf80bd74..5bf80bd74 100644
--- a/src/test/ui/cfg/cfg-path-error.rs
+++ b/tests/ui/cfg/cfg-path-error.rs
diff --git a/src/test/ui/cfg/cfg-path-error.stderr b/tests/ui/cfg/cfg-path-error.stderr
index 84b44b2b0..84b44b2b0 100644
--- a/src/test/ui/cfg/cfg-path-error.stderr
+++ b/tests/ui/cfg/cfg-path-error.stderr
diff --git a/src/test/ui/cfg/cfg-target-abi.rs b/tests/ui/cfg/cfg-target-abi.rs
index acc570fc8..acc570fc8 100644
--- a/src/test/ui/cfg/cfg-target-abi.rs
+++ b/tests/ui/cfg/cfg-target-abi.rs
diff --git a/src/test/ui/cfg/cfg-target-compact-errors.rs b/tests/ui/cfg/cfg-target-compact-errors.rs
index bca2275b1..bca2275b1 100644
--- a/src/test/ui/cfg/cfg-target-compact-errors.rs
+++ b/tests/ui/cfg/cfg-target-compact-errors.rs
diff --git a/src/test/ui/cfg/cfg-target-compact-errors.stderr b/tests/ui/cfg/cfg-target-compact-errors.stderr
index bb858301e..bb858301e 100644
--- a/src/test/ui/cfg/cfg-target-compact-errors.stderr
+++ b/tests/ui/cfg/cfg-target-compact-errors.stderr
diff --git a/src/test/ui/cfg/cfg-target-compact.rs b/tests/ui/cfg/cfg-target-compact.rs
index dc95a8091..dc95a8091 100644
--- a/src/test/ui/cfg/cfg-target-compact.rs
+++ b/tests/ui/cfg/cfg-target-compact.rs
diff --git a/src/test/ui/cfg/cfg-target-family.rs b/tests/ui/cfg/cfg-target-family.rs
index 5182cdc89..5182cdc89 100644
--- a/src/test/ui/cfg/cfg-target-family.rs
+++ b/tests/ui/cfg/cfg-target-family.rs
diff --git a/src/test/ui/cfg/cfg-target-vendor.rs b/tests/ui/cfg/cfg-target-vendor.rs
index 782458516..782458516 100644
--- a/src/test/ui/cfg/cfg-target-vendor.rs
+++ b/tests/ui/cfg/cfg-target-vendor.rs
diff --git a/src/test/ui/cfg/cfg_attr.rs b/tests/ui/cfg/cfg_attr.rs
index c959e68ac..c959e68ac 100644
--- a/src/test/ui/cfg/cfg_attr.rs
+++ b/tests/ui/cfg/cfg_attr.rs
diff --git a/src/test/ui/cfg/cfg_inner_static.rs b/tests/ui/cfg/cfg_inner_static.rs
index 45dbbcc10..45dbbcc10 100644
--- a/src/test/ui/cfg/cfg_inner_static.rs
+++ b/tests/ui/cfg/cfg_inner_static.rs
diff --git a/src/test/ui/cfg/cfg_stmt_expr.rs b/tests/ui/cfg/cfg_stmt_expr.rs
index 6381bb2d5..6381bb2d5 100644
--- a/src/test/ui/cfg/cfg_stmt_expr.rs
+++ b/tests/ui/cfg/cfg_stmt_expr.rs
diff --git a/src/test/ui/cfg/cfgs-on-items.rs b/tests/ui/cfg/cfgs-on-items.rs
index 9f2fc4942..9f2fc4942 100644
--- a/src/test/ui/cfg/cfgs-on-items.rs
+++ b/tests/ui/cfg/cfgs-on-items.rs
diff --git a/src/test/ui/cfg/conditional-compile-arch.rs b/tests/ui/cfg/conditional-compile-arch.rs
index 7de561df1..7de561df1 100644
--- a/src/test/ui/cfg/conditional-compile-arch.rs
+++ b/tests/ui/cfg/conditional-compile-arch.rs
diff --git a/src/test/ui/cfg/conditional-compile.rs b/tests/ui/cfg/conditional-compile.rs
index 69f4de431..69f4de431 100644
--- a/src/test/ui/cfg/conditional-compile.rs
+++ b/tests/ui/cfg/conditional-compile.rs
diff --git a/src/test/ui/cfg/crt-static-off-works.rs b/tests/ui/cfg/crt-static-off-works.rs
index 911467ee5..911467ee5 100644
--- a/src/test/ui/cfg/crt-static-off-works.rs
+++ b/tests/ui/cfg/crt-static-off-works.rs
diff --git a/src/test/ui/cfg/crt-static-on-works.rs b/tests/ui/cfg/crt-static-on-works.rs
index f89d1edd6..f89d1edd6 100644
--- a/src/test/ui/cfg/crt-static-on-works.rs
+++ b/tests/ui/cfg/crt-static-on-works.rs
diff --git a/src/test/ui/cfg/expanded-cfg.rs b/tests/ui/cfg/expanded-cfg.rs
index baa161af7..baa161af7 100644
--- a/src/test/ui/cfg/expanded-cfg.rs
+++ b/tests/ui/cfg/expanded-cfg.rs
diff --git a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
index 1f23dadc4..1f23dadc4 100644
--- a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
+++ b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.rs
diff --git a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
index 9ce4710d6..9ce4710d6 100644
--- a/src/test/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
+++ b/tests/ui/cfg/future-compat-crate-attributes-using-cfg_attr.stderr
diff --git a/src/test/ui/cfguard-run.rs b/tests/ui/cfguard-run.rs
index 3c4f9a1f5..3c4f9a1f5 100644
--- a/src/test/ui/cfguard-run.rs
+++ b/tests/ui/cfguard-run.rs