code_ownership 2.1.4 → 2.2.0

data/ext/cargo-vendor/error-stack-0.8.0/tests/ui/macro_invalid_args.stderr

@@ -0,0 +1,132 @@
+error[E0277]: the trait bound `&str: IntoReport` is not satisfied
+  --> tests/ui/macro_invalid_args.rs:17:11
+   |
+17 |     bail!("Error")
+   |     ------^^^^^^^-
+   |     |     |
+   |     |     the trait `std::error::Error` is not implemented for `str`
+   |     required by a bound introduced by this call
+   |
+help: the trait `IntoReport` is implemented for `error_stack::Report<C>`
+  --> src/report.rs
+   |
+   | impl<C: ?Sized> IntoReport for Report<C> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: required for `&str` to implement `std::error::Error`
+   = note: required for `error_stack::Report<&str>` to implement `From<&str>`
+   = note: required for `&str` to implement `Into<error_stack::Report<&str>>`
+   = note: required for `&str` to implement `IntoReport`
+
+error[E0308]: mismatched types
+  --> tests/ui/macro_invalid_args.rs:17:5
+   |
+17 |     bail!("Error")
+   |     ^^^^^^^^^^^^^^
+   |     |
+   |     expected `Report<RootError>`, found `Report<&str>`
+   |     arguments to this enum variant are incorrect
+   |
+   = note: expected struct `error_stack::Report<RootError>`
+              found struct `error_stack::Report<&str>`
+help: the type constructed contains `error_stack::Report<&str>` due to the type of the argument passed
+  --> tests/ui/macro_invalid_args.rs:17:5
+   |
+17 |     bail!("Error")
+   |     ^^^^^^^^^^^^^^ this argument influences the type of `Err`
+note: tuple variant defined here
+  --> $RUST/core/src/result.rs
+   |
+   |     Err(#[stable(feature = "rust1", since = "1.0.0")] E),
+   |     ^^^
+   = note: this error originates in the macro `bail` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `&str: Into<error_stack::Report<&str>>` is not satisfied
+  --> tests/ui/macro_invalid_args.rs:17:5
+   |
+17 |     bail!("Error")
+   |     ^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `str`
+   |
+help: the trait `IntoReport` is implemented for `error_stack::Report<C>`
+  --> src/report.rs
+   |
+   | impl<C: ?Sized> IntoReport for Report<C> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: required for `&str` to implement `std::error::Error`
+   = note: required for `error_stack::Report<&str>` to implement `From<&str>`
+   = note: required for `&str` to implement `Into<error_stack::Report<&str>>`
+   = note: required for `&str` to implement `IntoReport`
+   = note: this error originates in the macro `bail` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `&str: IntoReport` is not satisfied
+  --> tests/ui/macro_invalid_args.rs:21:27
+   |
+21 |     let _ = ensure!(true, "Error");
+   |             --------------^^^^^^^-
+   |             |             |
+   |             |             the trait `std::error::Error` is not implemented for `str`
+   |             required by a bound introduced by this call
+   |
+help: the trait `IntoReport` is implemented for `error_stack::Report<C>`
+  --> src/report.rs
+   |
+   | impl<C: ?Sized> IntoReport for Report<C> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: required for `&str` to implement `std::error::Error`
+   = note: required for `error_stack::Report<&str>` to implement `From<&str>`
+   = note: required for `&str` to implement `Into<error_stack::Report<&str>>`
+   = note: required for `&str` to implement `IntoReport`
+
+error[E0308]: mismatched types
+  --> tests/ui/macro_invalid_args.rs:21:13
+   |
+21 |     let _ = ensure!(true, "Error");
+   |             ^^^^^^^^^^^^^^^^^^^^^^
+   |             |
+   |             expected `Report<RootError>`, found `Report<&str>`
+   |             arguments to this enum variant are incorrect
+   |
+   = note: expected struct `error_stack::Report<RootError>`
+              found struct `error_stack::Report<&str>`
+help: the type constructed contains `error_stack::Report<&str>` due to the type of the argument passed
+  --> tests/ui/macro_invalid_args.rs:21:13
+   |
+21 |     let _ = ensure!(true, "Error");
+   |             ^^^^^^^^^^^^^^^^^^^^^^ this argument influences the type of `Err`
+note: tuple variant defined here
+  --> $RUST/core/src/result.rs
+   |
+   |     Err(#[stable(feature = "rust1", since = "1.0.0")] E),
+   |     ^^^
+   = note: this error originates in the macro `$crate::bail` which comes from the expansion of the macro `ensure` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `&str: Into<error_stack::Report<&str>>` is not satisfied
+  --> tests/ui/macro_invalid_args.rs:21:13
+   |
+21 |     let _ = ensure!(true, "Error");
+   |             ^^^^^^^^^^^^^^^^^^^^^^ the trait `std::error::Error` is not implemented for `str`
+   |
+help: the trait `IntoReport` is implemented for `error_stack::Report<C>`
+  --> src/report.rs
+   |
+   | impl<C: ?Sized> IntoReport for Report<C> {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: required for `&str` to implement `std::error::Error`
+   = note: required for `error_stack::Report<&str>` to implement `From<&str>`
+   = note: required for `&str` to implement `Into<error_stack::Report<&str>>`
+   = note: required for `&str` to implement `IntoReport`
+   = note: this error originates in the macro `$crate::bail` which comes from the expansion of the macro `ensure` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0308]: mismatched types
+  --> tests/ui/macro_invalid_args.rs:27:21
+   |
+27 |     let _ = ensure!("No boolean", RootError);
+   |             --------^^^^^^^^^^^^------------
+   |             |       |
+   |             |       expected `bool`, found `&str`
+   |             arguments to this function are incorrect
+   |
+note: associated function defined here
+  --> $RUST/core/src/convert/mod.rs
+   |
+   |     fn from(value: T) -> Self;
+   |        ^^^^

data/ext/cargo-vendor/error-stack-0.8.0/tests/ui/missing_args.rs

@@ -0,0 +1,32 @@
+use core::{error::Error, fmt};
+
+use error_stack::{Report, bail, ensure};
+
+#[derive(Debug)]
+pub struct RootError;
+
+impl fmt::Display for RootError {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt.write_str("root error")
+    }
+}
+
+impl Error for RootError {}
+
+fn empty_bail_arg() -> Result<(), Report<RootError>> {
+    bail!()
+}
+
+fn empty_ensure_arg() -> Result<(), Report<RootError>> {
+    let _ = ensure!();
+
+    Ok(())
+}
+
+fn missing_ensure_arg() -> Result<(), Report<RootError>> {
+    let _ = ensure!(true);
+
+    Ok(())
+}
+
+fn main() {}

data/ext/cargo-vendor/error-stack-0.8.0/tests/ui/missing_args.stderr

@@ -0,0 +1,35 @@
+error: unexpected end of macro invocation
+  --> tests/ui/missing_args.rs:17:5
+   |
+17 |     bail!()
+   |     ^^^^^^^ missing tokens in macro arguments
+   |
+note: while trying to match meta-variable `$err:expr`
+  --> src/macros.rs
+   |
+   |     ($err:expr $(,)?) => {{
+   |      ^^^^^^^^^
+
+error: unexpected end of macro invocation
+  --> tests/ui/missing_args.rs:21:13
+   |
+21 |     let _ = ensure!();
+   |             ^^^^^^^^^ missing tokens in macro arguments
+   |
+note: while trying to match meta-variable `$cond:expr`
+  --> src/macros.rs
+   |
+   |     ($cond:expr, $err:expr $(,)?) => {{
+   |      ^^^^^^^^^^
+
+error: unexpected end of macro invocation
+  --> tests/ui/missing_args.rs:27:25
+   |
+27 |     let _ = ensure!(true);
+   |                         ^ missing tokens in macro arguments
+   |
+note: while trying to match `,`
+  --> src/macros.rs
+   |
+   |     ($cond:expr, $err:expr $(,)?) => {{
+   |                ^

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

@@ -1,8 +1,8 @@
 #![deny(unused_must_use)]
 
-use core::fmt;
+use core::{error::Error, fmt};
 
-use error_stack::{Context, Report};
+use error_stack::Report;
 
 #[derive(Debug)]
 pub struct RootError;
@@ -13,7 +13,7 @@ impl fmt::Display for RootError {
     }
 }
 
-impl Context for RootError {}
+impl Error for RootError {}
 
 fn main() {
     Report::new(RootError);

data/ext/cargo-vendor/{error-stack-0.5.0 → error-stack-0.8.0}/tests/ui/must_use.stderr

@@ -7,7 +7,7 @@ error: unused `error_stack::Report` that must be used
 note: the lint level is defined here
   --> tests/ui/must_use.rs:1:9
    |
-1  | #![deny(unused_must_use)]
+ 1 | #![deny(unused_must_use)]
    |         ^^^^^^^^^^^^^^^
 help: use `let _ = ...` to ignore the resulting value
    |

data/ext/code_ownership/Cargo.toml

@@ -17,7 +17,7 @@ rb-sys = { version = "0.9.111", features = [
 magnus = { version = "0.8" }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_magnus = "0.10"
-codeowners = { git = "https://github.com/rubyatscale/codeowners-rs.git", tag = "v0.3.3" }
+codeowners = { git = "https://github.com/rubyatscale/codeowners-rs.git", tag = "v0.5.0" }
 
 [dev-dependencies]
 rb-sys = { version = "0.9.117", features = [

data/ext/code_ownership/src/lib.rs

@@ -74,6 +74,10 @@ fn version() -> String {
    runner::version()
 }
 
+fn clear_team_cache() {
+    runner::clear_team_cache();
+}
+
 fn validate(ruby: &Ruby, files: Option<Vec<String>>) -> Result<Value, Error> {
     let run_config = build_run_config();
     let files_vec = files.unwrap_or_default();
@@ -90,9 +94,16 @@ fn generate_and_validate(ruby: &Ruby, files: Option<Vec<String>>, skip_stage: bo
 
 fn validate_result(ruby: &Ruby, run_result: &runner::RunResult) -> Result<Value, Error> {
     if !run_result.validation_errors.is_empty() {
+        // codeowners-rs reports the stale-CODEOWNERS diff via info_messages; the raise is our only channel for it.
+        let messages: Vec<&str> = run_result
+            .validation_errors
+            .iter()
+            .chain(&run_result.info_messages)
+            .map(String::as_str)
+            .collect();
         Err(Error::new(
             ruby.exception_runtime_error(),
-            run_result.validation_errors.join("\n"),
+            messages.join("\n"),
         ))
     } else if !run_result.io_errors.is_empty() {
         Err(Error::new(
@@ -129,6 +140,7 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
     module.define_singleton_method("for_team", function!(for_team, 1))?;
     module.define_singleton_method("version", function!(version, 0))?;
     module.define_singleton_method("teams_for_files", function!(teams_for_files, 1))?;
+    module.define_singleton_method("clear_team_cache", function!(clear_team_cache, 0))?;
 
     Ok(())
 }

data/lib/code_ownership/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module CodeOwnership
-  VERSION = '2.1.4'
+  VERSION = '2.2.0'
 end

data/lib/code_ownership.rb

@@ -317,10 +317,13 @@ module CodeOwnership
   # Namely, the set of files, packages, and directories which are tracked for ownership should not change.
   # The primary reason this is helpful is for clients of CodeOwnership who want to test their code, and each test context
   # has different ownership and tracked files.
+  # It also clears the team files that codeowners-rs caches for `for_file(..., from_codeowners: false)`,
+  # so call it after adding or editing team files in a long-lived process.
   sig { void }
   def self.bust_caches!
     Private::FilePathTeamCache.bust_cache!
     Private::FilePathFinder.instance_variable_set(:@pwd, nil)
     Private::FilePathFinder.instance_variable_set(:@pwd_prefix, nil)
+    ::RustCodeOwners.clear_team_cache
   end
 end