code_ownership 2.1.4 → 2.2.0

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_debug__sources_nested_alternate.snap

@@ -3,12 +3,12 @@ source: libs/error-stack/tests/test_debug.rs
 expression: "format!(\"{report:#?}\")"
 ---
 context A
-├╴at libs/error-stack/tests/test_debug.rs:206:10
+├╴at libs/error-stack/tests/test_debug.rs:209:10
 ├╴2
 ├╴1
 │
 ╰┬▶ context A
- │  ├╴at libs/error-stack/tests/test_debug.rs:200:10
+ │  ├╴at libs/error-stack/tests/test_debug.rs:202:10
  │  ├╴4
  │  ├╴3
  │  │
@@ -17,16 +17,16 @@ context A
  │      ╰╴6
  │
  ╰▶ context A
-    ├╴at libs/error-stack/tests/test_debug.rs:195:10
+    ├╴at libs/error-stack/tests/test_debug.rs:197:10
     ├╴5
     ├╴3
     │
     ├─▶ context A
-    │   ├╴at libs/error-stack/tests/test_debug.rs:193:10
+    │   ├╴at libs/error-stack/tests/test_debug.rs:195:10
     │   ╰╴7
     │
     ╰┬▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:184:34
+     │  ├╴at libs/error-stack/tests/test_debug.rs:186:34
      │  ├╴9
      │  ├╴8
      │  │
@@ -34,7 +34,7 @@ context A
      │      ╰╴at libs/error-stack/tests/common.rs:9:5
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:178:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:179:10
      │  ├╴13
      │  ├╴10
      │  ├╴16
@@ -45,7 +45,7 @@ context A
      │      ╰╴at libs/error-stack/tests/common.rs:9:5
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:164:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:167:10
      │  ├╴15
      │  ├╴14
      │  ├╴10
@@ -57,7 +57,7 @@ context A
      │      ╰╴at libs/error-stack/tests/common.rs:9:5
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:174:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:176:30
      │  ├╴11
      │  ├╴9
      │  ├╴8
@@ -66,13 +66,13 @@ context A
      │      ╰╴at libs/error-stack/tests/common.rs:9:5
      │
      ╰▶ context A
-        ├╴at libs/error-stack/tests/test_debug.rs:170:10
+        ├╴at libs/error-stack/tests/test_debug.rs:173:10
         ├╴12
         ├╴9
         ├╴8
         │
         ├─▶ context A
-        │   ╰╴at libs/error-stack/tests/test_debug.rs:169:10
+        │   ╰╴at libs/error-stack/tests/test_debug.rs:172:10
         │
         ╰─▶ root error
             ╰╴at libs/error-stack/tests/common.rs:9:5

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_debug__sources_nested_alternate@spantrace-backtrace.snap

@@ -3,12 +3,12 @@ source: libs/error-stack/tests/test_debug.rs
 expression: "format!(\"{report:#?}\")"
 ---
 context A
-├╴at libs/error-stack/tests/test_debug.rs:206:10
+├╴at libs/error-stack/tests/test_debug.rs:209:10
 ├╴2
 ├╴1
 │
 ╰┬▶ context A
- │  ├╴at libs/error-stack/tests/test_debug.rs:200:10
+ │  ├╴at libs/error-stack/tests/test_debug.rs:202:10
  │  ├╴4
  │  ├╴3
  │  │
@@ -19,16 +19,16 @@ context A
  │      ╰╴6
  │
  ╰▶ context A
-    ├╴at libs/error-stack/tests/test_debug.rs:195:10
+    ├╴at libs/error-stack/tests/test_debug.rs:197:10
     ├╴5
     ├╴3
     │
     ├─▶ context A
-    │   ├╴at libs/error-stack/tests/test_debug.rs:193:10
+    │   ├╴at libs/error-stack/tests/test_debug.rs:195:10
     │   ╰╴7
     │
     ╰┬▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:184:34
+     │  ├╴at libs/error-stack/tests/test_debug.rs:186:34
      │  ├╴9
      │  ├╴8
      │  │
@@ -38,7 +38,7 @@ context A
      │      ╰╴span trace with 2 frames (2)
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:178:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:179:10
      │  ├╴13
      │  ├╴10
      │  ├╴16
@@ -51,7 +51,7 @@ context A
      │      ╰╴span trace with 2 frames (3)
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:164:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:167:10
      │  ├╴15
      │  ├╴14
      │  ├╴10
@@ -65,7 +65,7 @@ context A
      │      ╰╴span trace with 2 frames (4)
      │
      ├▶ context A
-     │  ├╴at libs/error-stack/tests/test_debug.rs:174:10
+     │  ├╴at libs/error-stack/tests/test_debug.rs:176:30
      │  ├╴11
      │  ├╴9
      │  ├╴8
@@ -76,13 +76,13 @@ context A
      │      ╰╴span trace with 2 frames (5)
      │
      ╰▶ context A
-        ├╴at libs/error-stack/tests/test_debug.rs:170:10
+        ├╴at libs/error-stack/tests/test_debug.rs:173:10
         ├╴12
         ├╴9
         ├╴8
         │
         ├─▶ context A
-        │   ╰╴at libs/error-stack/tests/test_debug.rs:169:10
+        │   ╰╴at libs/error-stack/tests/test_debug.rs:172:10
         │
         ╰─▶ root error
             ├╴at libs/error-stack/tests/common.rs:9:5

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_serialize__attachment.snap

@@ -1,5 +1,5 @@
 ---
-source: tests/test_serialize.rs
+source: libs/error-stack/tests/test_serialize.rs
 expression: report
 ---
 [

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_serialize__context.snap

@@ -1,5 +1,5 @@
 ---
-source: tests/test_serialize.rs
+source: libs/error-stack/tests/test_serialize.rs
 expression: report
 ---
 [

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_serialize__multiple_sources.snap

@@ -1,6 +1,6 @@
 ---
-source: tests/test_serialize.rs
-expression: a
+source: libs/error-stack/tests/test_serialize.rs
+expression: report_a
 ---
 [
   {

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/snapshots/test_serialize__multiple_sources_at_root.snap

@@ -1,6 +1,6 @@
 ---
-source: tests/test_serialize.rs
-expression: a
+source: libs/error-stack/tests/test_serialize.rs
+expression: report_a
 ---
 [
   {

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_attach.rs

@@ -3,9 +3,8 @@
 #[macro_use]
 mod common;
 
-#[allow(clippy::wildcard_imports)]
 use common::*;
-use error_stack::{AttachmentKind, FrameKind, FutureExt, Report, ResultExt};
+use error_stack::{AttachmentKind, FrameKind, FutureExt as _, Report, ResultExt as _};
 
 fn test_messages<E>(report: &Report<E>) {
     assert_eq!(
@@ -28,24 +27,51 @@ fn test_kinds<E>(report: &Report<E>) {
 }
 
 #[test]
-fn attach() {
+fn attach_opaque() {
     let report = create_report()
-        .attach(PrintableA)
-        .attach(PrintableB(0))
-        .attach(AttachmentA)
-        .attach(AttachmentB);
+        .attach_opaque(PrintableA)
+        .attach_opaque(PrintableB(0))
+        .attach_opaque(AttachmentA)
+        .attach_opaque(AttachmentB);
 
     test_messages(&report);
     test_kinds(&report);
 }
 
+#[test]
+fn attach_group() {
+    let mut root = create_report()
+        .attach_opaque(PrintableA)
+        .attach_opaque(PrintableB(0))
+        .expand();
+    let nested = create_report()
+        .attach_opaque(AttachmentA)
+        .attach_opaque(AttachmentB);
+
+    root.push(nested);
+
+    // bury the first error under a couple of attachments
+    let mut root = root
+        .attach(PrintableB(0))
+        .attach(PrintableB(1))
+        .attach(PrintableB(2));
+
+    let shallow = create_report()
+        .attach_opaque(AttachmentA)
+        .attach_opaque(AttachmentB);
+
+    root.push(shallow);
+
+    assert_eq!(root.current_contexts().count(), 3);
+}
+
 #[test]
 fn attach_result() {
     let error = create_error()
-        .attach(PrintableA)
-        .attach_lazy(|| PrintableB(0))
-        .attach(AttachmentA)
-        .attach_lazy(|| AttachmentB);
+        .attach_opaque(PrintableA)
+        .attach_opaque_with(|| PrintableB(0))
+        .attach_opaque(AttachmentA)
+        .attach_opaque_with(|| AttachmentB);
 
     let report = error.expect_err("Not an error");
     test_messages(&report);
@@ -55,10 +81,10 @@ fn attach_result() {
 #[test]
 fn attach_future() {
     let future = create_future()
-        .attach(PrintableA)
-        .attach_lazy(|| PrintableB(0))
-        .attach(AttachmentA)
-        .attach_lazy(|| AttachmentB);
+        .attach_opaque(PrintableA)
+        .attach_opaque_with(|| PrintableB(0))
+        .attach_opaque(AttachmentA)
+        .attach_opaque_with(|| AttachmentB);
 
     let error = futures::executor::block_on(future);
 

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_attach_printable.rs

@@ -3,9 +3,8 @@
 #[macro_use]
 mod common;
 
-#[allow(clippy::wildcard_imports)]
 use common::*;
-use error_stack::{AttachmentKind, FrameKind, FutureExt, Report, ResultExt};
+use error_stack::{AttachmentKind, FrameKind, FutureExt as _, Report, ResultExt as _};
 
 fn test_messages<E>(report: &Report<E>) {
     assert_eq!(
@@ -34,12 +33,12 @@ fn test_kinds<E>(report: &Report<E>) {
 }
 
 #[test]
-fn attach() {
+fn attach_opaque() {
     let report = create_report()
-        .attach_printable(PrintableA(0))
-        .attach_printable(PrintableB(0))
-        .attach_printable(ContextA(0))
-        .attach_printable(ContextB(0));
+        .attach(PrintableA(0))
+        .attach(PrintableB(0))
+        .attach(ContextA(0))
+        .attach(ContextB(0));
 
     test_messages(&report);
     test_kinds(&report);
@@ -48,10 +47,10 @@ fn attach() {
 #[test]
 fn attach_result() {
     let error = create_error()
-        .attach_printable(PrintableA(0))
-        .attach_printable_lazy(|| PrintableB(0))
-        .attach_printable(ContextA(0))
-        .attach_printable_lazy(|| ContextB(0));
+        .attach(PrintableA(0))
+        .attach_with(|| PrintableB(0))
+        .attach(ContextA(0))
+        .attach_with(|| ContextB(0));
 
     let report = error.expect_err("Not an error");
     test_messages(&report);
@@ -61,10 +60,10 @@ fn attach_result() {
 #[test]
 fn attach_future() {
     let future = create_future()
-        .attach_printable(PrintableA(0))
-        .attach_printable_lazy(|| PrintableB(0))
-        .attach_printable(ContextA(0))
-        .attach_printable_lazy(|| ContextB(0));
+        .attach(PrintableA(0))
+        .attach_with(|| PrintableB(0))
+        .attach(ContextA(0))
+        .attach_with(|| ContextB(0));
 
     let error = futures::executor::block_on(future);
 

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_backtrace.rs

@@ -9,7 +9,6 @@ mod common;
 
 use std::backtrace::Backtrace;
 
-#[allow(clippy::wildcard_imports)]
 use common::*;
 #[cfg(nightly)]
 use error_stack::Report;

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_change_context.rs

@@ -3,9 +3,8 @@
 #[macro_use]
 mod common;
 
-#[allow(clippy::wildcard_imports)]
 use common::*;
-use error_stack::{AttachmentKind, FrameKind, FutureExt, Report, ResultExt};
+use error_stack::{AttachmentKind, FrameKind, FutureExt as _, Report, ResultExt as _};
 
 fn test_messages<E>(report: &Report<E>) {
     assert_eq!(
@@ -28,24 +27,47 @@ fn test_kinds<E>(report: &Report<E>) {
 }
 
 #[test]
-fn attach() {
+fn attach_opaque() {
     let report = create_report()
         .change_context(ContextA(0))
-        .attach(AttachmentA)
+        .attach_opaque(AttachmentA)
         .change_context(ContextB(0))
-        .attach(AttachmentB);
+        .attach_opaque(AttachmentB);
 
     test_messages(&report);
     test_kinds(&report);
 }
 
+#[test]
+fn buried_duplicate_context_does_not_affect_current_contexts() {
+    let mut root = create_report()
+        .change_context(ContextA(0))
+        .change_context(RootError)
+        .expand();
+    let auxillary = create_report();
+    root.push(auxillary);
+
+    let mut root = root.attach_opaque(AttachmentA);
+
+    let shallow = create_report()
+        .attach_opaque(AttachmentB)
+        .change_context(ContextB(0))
+        .attach_opaque(AttachmentA)
+        .change_context(ContextA(0))
+        .change_context(RootError);
+
+    root.push(shallow);
+
+    assert_eq!(root.current_contexts().count(), 3);
+}
+
 #[test]
 fn attach_result() {
     let error = create_error()
         .change_context(ContextA(0))
-        .attach(AttachmentA)
+        .attach_opaque(AttachmentA)
         .change_context_lazy(|| ContextB(0))
-        .attach_lazy(|| AttachmentB);
+        .attach_opaque_with(|| AttachmentB);
 
     let report = error.expect_err("Not an error");
     test_messages(&report);
@@ -56,9 +78,9 @@ fn attach_result() {
 fn attach_future() {
     let future = create_future()
         .change_context(ContextA(0))
-        .attach(AttachmentA)
+        .attach_opaque(AttachmentA)
         .change_context_lazy(|| ContextB(0))
-        .attach_lazy(|| AttachmentB);
+        .attach_opaque_with(|| AttachmentB);
 
     let error = futures::executor::block_on(future);
 

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_compatibility.rs

@@ -1,16 +1,15 @@
 #![cfg(any(feature = "eyre", feature = "anyhow"))]
 #![cfg_attr(nightly, feature(error_generic_member_access))]
 #![cfg_attr(nightly, allow(clippy::incompatible_msrv))]
-#![cfg_attr(all(nightly, feature = "std"), feature(backtrace_frames))]
+#![cfg_attr(all(nightly, feature = "backtrace"), feature(backtrace_frames))]
 
 mod common;
 
 #[cfg(nightly)]
 use core::error;
 
-#[allow(clippy::wildcard_imports)]
 use common::*;
-use error_stack::IntoReportCompat;
+use error_stack::IntoReportCompat as _;
 #[cfg(all(nightly, feature = "backtrace"))]
 use error_stack::Report;
 
@@ -42,18 +41,15 @@ fn anyhow() {
         .context(PrintableA(0))
         .context(PrintableB(0)));
 
-    let report = create_report()
-        .attach_printable(PrintableA(0))
-        .attach_printable(PrintableB(0));
+    let report = create_report().attach(PrintableA(0)).attach(PrintableB(0));
 
-    #[allow(unused_mut)]
+    #[expect(unused_mut)]
     let mut report_messages = messages(&report);
 
     let anyhow_report = anyhow
         .into_report()
         .expect_err("should have returned error");
-    #[allow(unused_mut)]
-    let mut anyhow_messages = messages(&anyhow_report);
+    let anyhow_messages = messages(&anyhow_report);
 
     assert_eq!(
         remove_builtin_messages(anyhow_messages.into_iter().rev()),
@@ -154,16 +150,11 @@ fn eyre() {
         .wrap_err(PrintableA(0))
         .wrap_err(PrintableB(0)));
 
-    let report = create_report()
-        .attach_printable(PrintableA(0))
-        .attach_printable(PrintableB(0));
-
-    #[allow(unused_mut)]
-    let mut report_messages = messages(&report);
+    let report = create_report().attach(PrintableA(0)).attach(PrintableB(0));
+    let report_messages = messages(&report);
 
     let eyre_report = eyre.into_report().expect_err("should have returned error");
-    #[allow(unused_mut)]
-    let mut eyre_messages = messages(&eyre_report);
+    let eyre_messages = messages(&eyre_report);
 
     assert_eq!(
         remove_builtin_messages(eyre_messages.into_iter().rev()),

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/test_conversion.rs

@@ -1,11 +1,13 @@
 #![cfg(feature = "std")]
-#![cfg_attr(nightly, feature(error_generic_member_access))]
+#![cfg_attr(nightly, feature(error_generic_member_access, never_type))]
 #![allow(clippy::std_instead_of_core)]
 
 use core::fmt;
 use std::{error::Error, io};
 
-use error_stack::{FrameKind, Report, ResultExt};
+#[cfg(nightly)]
+use error_stack::IntoReport;
+use error_stack::{FrameKind, Report, ResultExt as _};
 
 fn io_error() -> Result<(), io::Error> {
     Err(io::Error::from(io::ErrorKind::Other))
@@ -92,7 +94,7 @@ fn into_report() {
 }
 
 fn returning_boxed_error() -> Result<(), Box<dyn core::error::Error + Send + Sync>> {
-    io_error().attach(10_u32)?;
+    io_error().attach_opaque(10_u32)?;
     Ok(())
 }
 
@@ -110,3 +112,23 @@ fn boxed_error() {
         10
     );
 }
+
+#[cfg(nightly)]
+#[test]
+fn never_report() {
+    trait NeverReport: Sized {
+        type Error: IntoReport;
+
+        fn never_report(self) -> Result<Self, Self::Error>;
+    }
+
+    impl NeverReport for () {
+        type Error = !;
+
+        fn never_report(self) -> Result<Self, Self::Error> {
+            Ok(())
+        }
+    }
+
+    let Ok(()) = ().never_report();
+}