Skip to content

Commit ba86c04

Browse files
committed
Auto merge of #149704 - matthiaskrgr:rollup-u4zhw99, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #146826 (Implement `Allocator` for `&mut A` where `A: Allocator + ?Sized`) - #148487 (add Option::into_flat_iter) - #148814 (stabilize `array_windows`) - #149401 (Fix `name()` functions for local defs in rustc_public) - #149683 (Fix armv8r-none-eabihf tier) r? `@ghost` `@rustbot` modify labels: rollup
2 parents da2544b + 60a4413 commit ba86c04

File tree

44 files changed

+286
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+286
-156
lines changed

compiler/rustc_ast/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//! This API is completely unstable and subject to change.
66
77
// tidy-alphabetical-start
8+
#![cfg_attr(bootstrap, feature(array_windows))]
89
#![doc(test(attr(deny(warnings), allow(internal_features))))]
9-
#![feature(array_windows)]
1010
#![feature(associated_type_defaults)]
1111
#![feature(box_patterns)]
1212
#![feature(if_let_guard)]

compiler/rustc_data_structures/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#![allow(internal_features)]
1111
#![allow(rustc::default_hash_types)]
1212
#![allow(rustc::potential_query_instability)]
13+
#![cfg_attr(bootstrap, feature(array_windows))]
1314
#![deny(unsafe_op_in_unsafe_fn)]
1415
#![feature(allocator_api)]
15-
#![feature(array_windows)]
1616
#![feature(ascii_char)]
1717
#![feature(ascii_char_variants)]
1818
#![feature(assert_matches)]

compiler/rustc_errors/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#![allow(rustc::diagnostic_outside_of_impl)]
88
#![allow(rustc::direct_use_of_rustc_type_ir)]
99
#![allow(rustc::untranslatable_diagnostic)]
10-
#![feature(array_windows)]
10+
#![cfg_attr(bootstrap, feature(array_windows))]
1111
#![feature(assert_matches)]
1212
#![feature(associated_type_defaults)]
1313
#![feature(box_patterns)]

compiler/rustc_expand/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tidy-alphabetical-start
22
#![allow(internal_features)]
33
#![allow(rustc::diagnostic_outside_of_impl)]
4-
#![feature(array_windows)]
4+
#![cfg_attr(bootstrap, feature(array_windows))]
55
#![feature(associated_type_defaults)]
66
#![feature(if_let_guard)]
77
#![feature(macro_metavar_expr)]

compiler/rustc_lint/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
2222
// tidy-alphabetical-start
2323
#![allow(internal_features)]
24-
#![feature(array_windows)]
24+
#![cfg_attr(bootstrap, feature(array_windows))]
2525
#![feature(assert_matches)]
2626
#![feature(box_patterns)]
2727
#![feature(if_let_guard)]

compiler/rustc_middle/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#![allow(rustc::diagnostic_outside_of_impl)]
3030
#![allow(rustc::direct_use_of_rustc_type_ir)]
3131
#![allow(rustc::untranslatable_diagnostic)]
32+
#![cfg_attr(bootstrap, feature(array_windows))]
3233
#![feature(allocator_api)]
33-
#![feature(array_windows)]
3434
#![feature(assert_matches)]
3535
#![feature(associated_type_defaults)]
3636
#![feature(box_as_ptr)]

compiler/rustc_middle/src/ty/print/pretty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ define_helper!(
105105
///
106106
/// Overrides `with_crate_prefix`.
107107
108-
// This function is not currently used in-tree, but it's used by a downstream rustc-driver in
108+
// This function is used by `rustc_public` and downstream rustc-driver in
109109
// Ferrocene. Please check with them before removing it.
110110
fn with_resolve_crate_name(CrateNamePrefixGuard, SHOULD_PREFIX_WITH_CRATE_NAME);
111111
/// Adds the `crate::` prefix to paths where appropriate.

compiler/rustc_mir_transform/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// tidy-alphabetical-start
2-
#![feature(array_windows)]
2+
#![cfg_attr(bootstrap, feature(array_windows))]
33
#![feature(assert_matches)]
44
#![feature(box_patterns)]
55
#![feature(const_type_name)]

compiler/rustc_monomorphize/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// tidy-alphabetical-start
2-
#![feature(array_windows)]
2+
#![cfg_attr(bootstrap, feature(array_windows))]
33
#![feature(file_buffered)]
44
#![feature(if_let_guard)]
55
#![feature(impl_trait_in_assoc_type)]

compiler/rustc_public/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl CrateItem {
178178
pub fn emit_mir<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
179179
self.body()
180180
.ok_or_else(|| io::Error::other(format!("No body found for `{}`", self.name())))?
181-
.dump(w, &self.name())
181+
.dump(w, &self.trimmed_name())
182182
}
183183
}
184184

0 commit comments

Comments
 (0)