diff options
| author | bors <bors@rust-lang.org> | 2021-06-22 01:14:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-22 01:14:31 +0000 |
| commit | 2c04f0bb171bb7dc573d0da4b59960106823c2cd (patch) | |
| tree | 17cd6d646a69fe85d3b46de682002aa7e0cfbba0 /compiler/rustc_data_structures/src | |
| parent | 4573a4a879a8e1f773944a8859e4dcd136138af8 (diff) | |
| parent | 4495ce75d975136173dbd4c139f00d1f508a6994 (diff) | |
| download | rust-2c04f0bb171bb7dc573d0da4b59960106823c2cd.tar.gz rust-2c04f0bb171bb7dc573d0da4b59960106823c2cd.zip | |
Auto merge of #86527 - JohnTitor:rollup-cbu78g4, r=JohnTitor
Rollup of 11 pull requests
Successful merges:
- #85054 (Revert SGX inline asm syntax)
- #85182 (Move `available_concurrency` implementation to `sys`)
- #86037 (Add `io::Cursor::{remaining, remaining_slice, is_empty}`)
- #86114 (Reopen #79692 (Format symbols under shared frames))
- #86297 (Allow to pass arguments to rustdoc-gui tool)
- #86334 (Resolve type aliases to the type they point to in intra-doc links)
- #86367 (Fix comment about rustc_inherit_overflow_checks in abs().)
- #86381 (Add regression test for issue #39161)
- #86387 (Remove `#[allow(unused_lifetimes)]` which is now unnecessary)
- #86398 (Add regression test for issue #54685)
- #86493 (Say "this enum variant takes"/"this struct takes" instead of "this function takes")
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/captures.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_data_structures/src/captures.rs b/compiler/rustc_data_structures/src/captures.rs index 26b90ebfd5f..677ccb31454 100644 --- a/compiler/rustc_data_structures/src/captures.rs +++ b/compiler/rustc_data_structures/src/captures.rs @@ -3,8 +3,6 @@ /// Basically a workaround; see [this comment] for details. /// /// [this comment]: https://github.com/rust-lang/rust/issues/34511#issuecomment-373423999 -// FIXME(eddyb) false positive, the lifetime parameter is "phantom" but needed. -#[allow(unused_lifetimes)] pub trait Captures<'a> {} impl<'a, T: ?Sized> Captures<'a> for T {} |