Remove `in_band_lifetimes` for `rustc_passes` #91896

pitaj · 2021-12-14T05:18:53Z

#91867

rust-highfive · 2021-12-14T05:18:56Z

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

michaelwoerister

Thanks for the PR, @pitaj!

This looks good to me, except for the nit about using &'_ [Attribute] instead of just &[Attribute].

michaelwoerister · 2021-12-14T09:29:38Z

compiler/rustc_passes/src/check_attr.rs

@@ -382,7 382,7 @@ impl CheckAttrVisitor<'tcx> {
 &self,
 hir_id: HirId,
 attr_span: &Span,
- attrs: &'hir [Attribute],
+ attrs: &'_ [Attribute],


Isn't this the same as attrs: &[Attribute]?

michaelwoerister · 2021-12-14T09:32:22Z

compiler/rustc_passes/src/check_attr.rs

@@ -1663,7 1663,7 @@ impl CheckAttrVisitor<'tcx> {
 }
 }

- fn check_used(&self, attrs: &'hir [Attribute], target: Target) {
+ fn check_used(&self, attrs: &'_ [Attribute], target: Target) {


michaelwoerister · 2021-12-14T09:36:44Z

compiler/rustc_passes/src/check_attr.rs

@@ -1481,7 1481,7 @@ impl CheckAttrVisitor<'tcx> {
 /// Checks if the `#[repr]` attributes on `item` are valid.
 fn check_repr(
 &self,
- attrs: &'hir [Attribute],
+ attrs: &'_ [Attribute],


pitaj · 2021-12-14T17:08:02Z

@michaelwoerister good catch, those should be fixed now.

bors · 2021-12-15T07:13:54Z

☔ The latest upstream changes (presumably #91945) made this pull request unmergeable. Please resolve the merge conflicts.

michaelwoerister · 2021-12-15T09:01:06Z

Thanks! I'll r after the required rebase.

pitaj · 2021-12-16T04:06:50Z

@michaelwoerister rebased and ready

michaelwoerister · 2021-12-16T16:12:12Z

Thanks, @pitaj!

@bors r rollup

bors · 2021-12-16T16:12:14Z

📌 Commit c4bafaf has been approved by michaelwoerister

Remove `in_band_lifetimes` for `rustc_passes` rust-lang#91867

…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#91439 (Mark defaulted `PartialEq`/`PartialOrd` methods as const) - rust-lang#91516 (Improve suggestion to change struct field to &mut) - rust-lang#91896 (Remove `in_band_lifetimes` for `rustc_passes`) - rust-lang#91909 (:arrow_up: rust-analyzer) - rust-lang#91922 (Remove `in_band_lifetimes` from `rustc_mir_dataflow`) - rust-lang#92025 (Revert "socket ancillary data implementation for dragonflybsd.") - rust-lang#92030 (Update stdlib to the 2021 edition) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Pkgsrc changes: * Bump available bootstraps to 1.58.1. * Adjust one patch (and checksum) so that it still applies. Upstream changes: Version 1.59.0 (2022-02-24) ========================== Language -------- - [Stabilize default arguments for const generics][90207] - [Stabilize destructuring assignment][90521] - [Relax private in public lint on generic bounds and where clauses of trait impls][90586] - [Stabilize asm! and global_asm! for x86, x86_64, ARM, Aarch64, and RISC-V][91728] Compiler -------- - [Stabilize new symbol mangling format, leaving it opt-in (-Csymbol-mangling-version=v0)][90128] - [Emit LLVM optimization remarks when enabled with `-Cremark`][90833] - [Fix sparc64 ABI for aggregates with floating point members][91003] - [Warn when a `#[test]`-like built-in attribute macro is present multiple times.][91172] - [Add support for riscv64gc-unknown-freebsd][91284] - [Stabilize `-Z emit-future-incompat` as `--json future-incompat`][91535] - [Soft disable incremental compilation][94124] This release disables incremental compilation, unless the user has explicitly opted in via the newly added RUSTC_FORCE_INCREMENTAL=1 environment variable. This is due to a known and relatively frequently occurring bug in incremental compilation, which causes builds to issue internal compiler errors. This particular bug is already fixed on nightly, but that fix has not yet rolled out to stable and is deemed too risky for a direct stable backport. As always, we encourage users to test with nightly and report bugs so that we can track failures and fix issues earlier. See [94124] for more details. [94124]: rust-lang/rust#94124 Libraries --------- - [Remove unnecessary bounds for some Hash{Map,Set} methods][91593] Stabilized APIs --------------- - [`std::thread::available_parallelism`][available_parallelism] - [`Result::copied`][result-copied] - [`Result::cloned`][result-cloned] - [`arch::asm!`][asm] - [`arch::global_asm!`][global_asm] - [`ops::ControlFlow::is_break`][is_break] - [`ops::ControlFlow::is_continue`][is_continue] - [`TryFrom<char> for u8`][try_from_char_u8] - [`char::TryFromCharError`][try_from_char_err] implementing `Clone`, `Debug`, `Display`, `PartialEq`, `Copy`, `Eq`, `Error` - [`iter::zip`][zip] - [`NonZeroU8::is_power_of_two`][is_power_of_two8] - [`NonZeroU16::is_power_of_two`][is_power_of_two16] - [`NonZeroU32::is_power_of_two`][is_power_of_two32] - [`NonZeroU64::is_power_of_two`][is_power_of_two64] - [`NonZeroU128::is_power_of_two`][is_power_of_two128] - [`DoubleEndedIterator for ToLowercase`][lowercase] - [`DoubleEndedIterator for ToUppercase`][uppercase] - [`TryFrom<&mut [T]> for [T; N]`][tryfrom_ref_arr] - [`UnwindSafe for Once`][unwindsafe_once] - [`RefUnwindSafe for Once`][refunwindsafe_once] - [armv8 neon intrinsics for aarch64][stdarch/1266] Const-stable: - [`mem::MaybeUninit::as_ptr`][muninit_ptr] - [`mem::MaybeUninit::assume_init`][muninit_init] - [`mem::MaybeUninit::assume_init_ref`][muninit_init_ref] - [`ffi::CStr::from_bytes_with_nul_unchecked`][cstr_from_bytes] Cargo ----- - [Stabilize the `strip` profile option][cargo/10088] - [Stabilize future-incompat-report][cargo/10165] - [Support abbreviating `--release` as `-r`][cargo/10133] - [Support `term.quiet` configuration][cargo/10152] - [Remove `--host` from cargo {publish,search,login}][cargo/10145] Compatibility Notes ------------------- - [Refactor weak symbols in std::sys::unix][90846] This may add new, versioned, symbols when building with a newer glibc, as the standard library uses weak linkage rather than dynamically attempting to load certain symbols at runtime. - [Deprecate crate_type and crate_name nested inside `#![cfg_attr]`][83744] This adds a future compatibility lint to supporting the use of cfg_attr wrapping either crate_type or crate_name specification within Rust files; it is recommended that users migrate to setting the equivalent command line flags. - [Remove effect of `#[no_link]` attribute on name resolution][92034] This may expose new names, leading to conflicts with preexisting names in a given namespace and a compilation failure. - [Cargo will document libraries before binaries.][cargo/10172] - [Respect doc=false in dependencies, not just the root crate][cargo/10201] - [Weaken guarantee around advancing underlying iterators in zip][83791] - [Make split_inclusive() on an empty slice yield an empty output][89825] - [Update std::env::temp_dir to use GetTempPath2 on Windows when available.][89999] - [unreachable! was updated to match other formatting macro behavior on Rust 2021][92137] Internal Changes ---------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Fix many cases of normalization-related ICEs][91255] - [Replace dominators algorithm with simple Lengauer-Tarjan][85013] - [Store liveness in interval sets for region inference][90637] - [Remove `in_band_lifetimes` from the compiler and standard library, in preparation for removing this unstable feature.][91867] [91867]: rust-lang/rust#91867 [83744]: rust-lang/rust#83744 [83791]: rust-lang/rust#83791 [85013]: rust-lang/rust#85013 [89825]: rust-lang/rust#89825 [89999]: rust-lang/rust#89999 [90128]: rust-lang/rust#90128 [90207]: rust-lang/rust#90207 [90521]: rust-lang/rust#90521 [90586]: rust-lang/rust#90586 [90637]: rust-lang/rust#90637 [90833]: rust-lang/rust#90833 [90846]: rust-lang/rust#90846 [91003]: rust-lang/rust#91003 [91172]: rust-lang/rust#91172 [91255]: rust-lang/rust#91255 [91284]: rust-lang/rust#91284 [91535]: rust-lang/rust#91535 [91593]: rust-lang/rust#91593 [91728]: rust-lang/rust#91728 [91878]: rust-lang/rust#91878 [91896]: rust-lang/rust#91896 [91926]: rust-lang/rust#91926 [91984]: rust-lang/rust#91984 [92020]: rust-lang/rust#92020 [92034]: rust-lang/rust#92034 [92483]: rust-lang/rust#92483 [cargo/10088]: rust-lang/cargo#10088 [cargo/10133]: rust-lang/cargo#10133 [cargo/10145]: rust-lang/cargo#10145 [cargo/10152]: rust-lang/cargo#10152 [cargo/10165]: rust-lang/cargo#10165 [cargo/10172]: rust-lang/cargo#10172 [cargo/10201]: rust-lang/cargo#10201 [cargo/10269]: rust-lang/cargo#10269 [cstr_from_bytes]: https://doc.rust-lang.org/stable/std/ffi/struct.CStr.html#method.from_bytes_with_nul_unchecked [muninit_ptr]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.as_ptr [muninit_init]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init [muninit_init_ref]: https://doc.rust-lang.org/stable/std/mem/union.MaybeUninit.html#method.assume_init_ref [unwindsafe_once]: https://doc.rust-lang.org/stable/std/sync/struct.Once.html#impl-UnwindSafe [refunwindsafe_once]: https://doc.rust-lang.org/stable/std/sync/struct.Once.html#impl-RefUnwindSafe [tryfrom_ref_arr]: https://doc.rust-lang.org/stable/std/convert/trait.TryFrom.html#impl-TryFrom<&'_ mut [T]> [lowercase]: https://doc.rust-lang.org/stable/std/char/struct.ToLowercase.html#impl-DoubleEndedIterator [uppercase]: https://doc.rust-lang.org/stable/std/char/struct.ToUppercase.html#impl-DoubleEndedIterator [try_from_char_err]: https://doc.rust-lang.org/stable/std/char/struct.TryFromCharError.html [available_parallelism]: https://doc.rust-lang.org/stable/std/thread/fn.available_parallelism.html [result-copied]: https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.copied [result-cloned]: https://doc.rust-lang.org/stable/std/result/enum.Result.html#method.cloned [asm]: https://doc.rust-lang.org/stable/core/arch/macro.asm.html [global_asm]: https://doc.rust-lang.org/stable/core/arch/macro.global_asm.html [is_break]: https://doc.rust-lang.org/stable/std/ops/enum.ControlFlow.html#method.is_break [is_continue]: https://doc.rust-lang.org/stable/std/ops/enum.ControlFlow.html#method.is_continue [try_from_char_u8]: https://doc.rust-lang.org/stable/std/primitive.char.html#impl-TryFrom [zip]: https://doc.rust-lang.org/stable/std/iter/fn.zip.html [is_power_of_two8]: https://doc.rust-lang.org/stable/core/num/struct.NonZeroU8.html#method.is_power_of_two [is_power_of_two16]: https://doc.rust-lang.org/stable/core/num/struct.NonZeroU16.html#method.is_power_of_two [is_power_of_two32]: https://doc.rust-lang.org/stable/core/num/struct.NonZeroU32.html#method.is_power_of_two [is_power_of_two64]: https://doc.rust-lang.org/stable/core/num/struct.NonZeroU64.html#method.is_power_of_two [is_power_of_two128]: https://doc.rust-lang.org/stable/core/num/struct.NonZeroU128.html#method.is_power_of_two [stdarch/1266]: rust-lang/stdarch#1266

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 14, 2021

rust-highfive assigned michaelwoerister Dec 14, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 14, 2021

pitaj mentioned this pull request Dec 14, 2021

Stop using in_band_lifetimes in compiler crates #91867

Closed

21 tasks

michaelwoerister reviewed Dec 14, 2021

View reviewed changes

Remove in_band_lifetimes for rustc_passes

c4bafaf

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2021

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 17, 2021

Rollup merge of rust-lang#91896 - pitaj:91867-passes, r=michaelwoerister

3379500

Remove `in_band_lifetimes` for `rustc_passes` rust-lang#91867

matthiaskrgr mentioned this pull request Dec 17, 2021

Rollup of 7 pull requests #92027

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 17, 2021

Rollup merge of rust-lang#91896 - pitaj:91867-passes, r=michaelwoerister

44f358b

Remove `in_band_lifetimes` for `rustc_passes` rust-lang#91867

matthiaskrgr mentioned this pull request Dec 17, 2021

Rollup of 7 pull requests #92031

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 18, 2021

Rollup merge of rust-lang#91896 - pitaj:91867-passes, r=michaelwoerister

a5732ac

Remove `in_band_lifetimes` for `rustc_passes` rust-lang#91867

matthiaskrgr mentioned this pull request Dec 18, 2021

Rollup of 7 pull requests #92053

Closed

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 18, 2021

Rollup merge of rust-lang#91896 - pitaj:91867-passes, r=michaelwoerister

d31cfe4

Remove `in_band_lifetimes` for `rustc_passes` rust-lang#91867

This was referenced Dec 18, 2021

Rollup of 7 pull requests #92060

Closed

Rollup of 7 pull requests #92062

Merged

bors merged commit eb3cc13 into rust-lang:master Dec 18, 2021

rustbot added this to the 1.59.0 milestone Dec 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `in_band_lifetimes` for `rustc_passes` #91896

Remove `in_band_lifetimes` for `rustc_passes` #91896

pitaj commented Dec 14, 2021

rust-highfive commented Dec 14, 2021

michaelwoerister left a comment

michaelwoerister Dec 14, 2021 •

edited

Loading

michaelwoerister Dec 14, 2021

michaelwoerister Dec 14, 2021

pitaj commented Dec 14, 2021

bors commented Dec 15, 2021

michaelwoerister commented Dec 15, 2021

pitaj commented Dec 16, 2021

michaelwoerister commented Dec 16, 2021

bors commented Dec 16, 2021

Remove in_band_lifetimes for rustc_passes #91896

Remove in_band_lifetimes for rustc_passes #91896

Conversation

pitaj commented Dec 14, 2021

rust-highfive commented Dec 14, 2021

michaelwoerister left a comment

Choose a reason for hiding this comment

michaelwoerister Dec 14, 2021 • edited Loading

Choose a reason for hiding this comment

michaelwoerister Dec 14, 2021

Choose a reason for hiding this comment

michaelwoerister Dec 14, 2021

Choose a reason for hiding this comment

pitaj commented Dec 14, 2021

bors commented Dec 15, 2021

michaelwoerister commented Dec 15, 2021

pitaj commented Dec 16, 2021

michaelwoerister commented Dec 16, 2021

bors commented Dec 16, 2021

Remove `in_band_lifetimes` for `rustc_passes` #91896

Remove `in_band_lifetimes` for `rustc_passes` #91896

michaelwoerister Dec 14, 2021 •

edited

Loading