Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use &dyn Any rather than &(dyn Any + Send) for PanicInfo::payload() #110799

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −6
Draft

Use &dyn Any rather than &(dyn Any + Send) for PanicInfo::payload() #110799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
825b5ae
Use &dyn Any rather than &(dyn Any + Send) for panic payload.
m-ou-se Apr 25, 2023
70c69f0
Update Clippy's `tester` dependency.
m-ou-se May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4826,9 +4826,9 @@ dependencies = [

[[package]]
name = "tester"
version = "0.9.0"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0639d10d8f4615f223a57275cf40f9bdb7cfbb806bcb7f7cc56e3beb55a576eb"
checksum = "89e8bf7e0eb2dd7b4228cc1b6821fc5114cd6841ae59f652a85488c016091e5f"
dependencies = [
"cfg-if",
"getopts",
Expand Down
4 changes: 2 additions & 2 deletions library/core/src/panic/panic_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::panic::Location;
#[stable(feature = "panic_hooks", since = "1.10.0")]
#[derive(Debug)]
pub struct PanicInfo<'a> {
payload: &'a (dyn Any + Send),
payload: &'a dyn Any,
message: Option<&'a fmt::Arguments<'a>>,
location: &'a Location<'a>,
can_unwind: bool,
Expand Down Expand Up @@ -81,7 +81,7 @@ impl<'a> PanicInfo<'a> {
/// ```
#[must_use]
#[stable(feature = "panic_hooks", since = "1.10.0")]
pub fn payload(&self) -> &(dyn Any + Send) {
pub fn payload(&self) -> &dyn Any {
self.payload
}

Expand Down
2 changes: 1 addition & 1 deletion library/test/src/test_result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub enum TestResult {
/// and associated data.
pub fn calc_result<'a>(
desc: &TestDesc,
task_result: Result<(), &'a (dyn Any + 'static + Send)>,
task_result: Result<(), &'a dyn Any>,
time_opts: &Option<time::TestTimeOptions>,
exec_time: &Option<time::TestExecTime>,
) -> TestResult {
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ termize = "0.1"

[dev-dependencies]
compiletest_rs = { version = "0.10", features = ["tmp"] }
tester = "0.9"
tester = "0.9.1"
regex = "1.5"
toml = "0.5"
walkdir = "2.3"
Expand Down