Skip to content

Commit 745e738

Browse files
committed
fix negative impl assertion on 1.60+
see rust-lang/rust#94791
1 parent 1fd90f0 commit 745e738

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

actix-files/src/named.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,10 @@ impl NamedFile {
210210
Self::from_file(file, path)
211211
}
212212

213-
#[allow(rustdoc::broken_intra_doc_links)]
214213
/// Attempts to open a file asynchronously in read-only mode.
215214
///
216-
/// When the `experimental-io-uring` crate feature is enabled, this will be async.
217-
/// Otherwise, it will be just like [`open`][Self::open].
215+
/// When the `experimental-io-uring` crate feature is enabled, this will be async. Otherwise, it
216+
/// will behave just like `open`.
218217
///
219218
/// # Examples
220219
/// ```

actix-http/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ memchr = "2.4"
110110
once_cell = "1.9"
111111
rcgen = "0.8"
112112
regex = "1.3"
113+
rustversion = "1"
113114
rustls-pemfile = "0.2"
114115
serde = { version = "1.0", features = ["derive"] }
115116
serde_json = "1.0"

actix-http/src/h1/payload.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ mod tests {
263263
assert_not_impl_any!(Payload: Send, Sync, UnwindSafe, RefUnwindSafe);
264264

265265
assert_impl_all!(Inner: Unpin, Send, Sync);
266+
#[rustversion::before(1.60)]
266267
assert_not_impl_any!(Inner: UnwindSafe, RefUnwindSafe);
268+
#[rustversion::since(1.60)]
269+
assert_impl_all!(Inner: UnwindSafe, RefUnwindSafe);
267270

268271
#[actix_rt::test]
269272
async fn test_unread_data() {

0 commit comments

Comments
 (0)