Merging upstream version 1.74.1+dfsg1.

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

3 files changed, 93 insertions, 0 deletions

diff --git a/tests/ui/macros/issue-2804.rs b/tests/ui/macros/issue-2804.rs
new file mode 100644
index 000000000..571028c5e
--- /dev/null
+++ b/tests/ui/macros/issue-2804.rs
@@ -0,0 +1,81 @@
+// run-pass
+
+#![allow(non_camel_case_types)]
+#![allow(dead_code)]
+
+use std::collections::{BTreeMap, HashMap};
+use std::option;
+
+#[derive(Clone, Debug)]
+enum Json {
+    I64(i64),
+    U64(u64),
+    F64(f64),
+    String(String),
+    Boolean(bool),
+    Array(Array),
+    Object(Object),
+    Null,
+}
+
+type Array = Vec<Json>;
+type Object = BTreeMap<String, Json>;
+
+enum object {
+    bool_value(bool),
+    int_value(i64),
+}
+
+fn lookup(table: Object, key: String, default: String) -> String
+{
+    match table.get(&key) {
+        option::Option::Some(&Json::String(ref s)) => {
+            s.to_string()
+        }
+        option::Option::Some(value) => {
+            println!("{} was expected to be a string but is a {:?}", key, value);
+            default
+        }
+        option::Option::None => {
+            default
+        }
+    }
+}
+
+fn add_interface(_store: isize, managed_ip: String, data: Json) -> (String, object)
+{
+    match &data {
+        &Json::Object(ref interface) => {
+            let name = lookup(interface.clone(),
+                              "ifDescr".to_string(),
+                              "".to_string());
+            let label = format!("{}-{}", managed_ip, name);
+
+            (label, object::bool_value(false))
+        }
+        _ => {
+            println!("Expected dict for {} interfaces, found {:?}", managed_ip, data);
+            ("gnos:missing-interface".to_string(), object::bool_value(true))
+        }
+    }
+}
+
+fn add_interfaces(store: isize, managed_ip: String, device: HashMap<String, Json>)
+-> Vec<(String, object)> {
+    match device["interfaces"] {
+        Json::Array(ref interfaces) =>
+        {
+          interfaces.iter().map(|interface| {
+                add_interface(store, managed_ip.clone(), (*interface).clone())
+          }).collect()
+        }
+        _ =>
+        {
+            println!("Expected list for {} interfaces, found {:?}", managed_ip,
+                     device["interfaces"]);
+            Vec::new()
+        }
+    }
+}
+
+pub fn main() {}
diff --git a/tests/ui/macros/issue-39467.rs b/tests/ui/macros/issue-39467.rs
new file mode 100644
index 000000000..397751e4e
--- /dev/null
+++ b/tests/ui/macros/issue-39467.rs
@@ -0,0 +1,11 @@
+// check-pass
+#![allow(dead_code)]
+macro_rules! expr { () => { () } }
+
+enum A {}
+
+impl A {
+    const A: () = expr!();
+}
+
+fn main() {}
diff --git a/tests/ui/macros/must-use-in-macro-55516.stderr b/tests/ui/macros/must-use-in-macro-55516.stderr
index 8878b0eea..7bf4aaab5 100644
--- a/tests/ui/macros/must-use-in-macro-55516.stderr
+++ b/tests/ui/macros/must-use-in-macro-55516.stderr
@@ -6,6 +6,7 @@ LL |     write!(&mut example, "{}", 42);
    |
    = note: this `Result` may be an `Err` variant, which should be handled
    = note: `-W unused-must-use` implied by `-W unused`
+   = help: to override `-W unused` add `#[allow(unused_must_use)]`
    = note: this warning originates in the macro `write` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: 1 warning emitted