Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions changelog.d/7442-fmt-after-7434.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
**Fixed** `cargo fmt --all -- --check` failed on `main` after #7434.

`lint` is a required context, so a red `lint` means every subsequent merge
bypasses a required gate. Two hunks, six lines: an `assert!` in
`gc/tests/telemetry_verifier.rs` exceeding rustfmt's default `fn_call_width`, and
a `pub(crate) use` in `object/field_get_set.rs` added below the `pub use` block
where `reorder_imports` wants it above.
5 changes: 4 additions & 1 deletion crates/perry-runtime/src/gc/tests/telemetry_verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,10 @@ fn test_pause_ring_records_max_and_window() {
fn test_record_collection_bumps_read_pic_epoch() {
use std::sync::atomic::Ordering;
let before = crate::object::PERRY_IC_EPOCH.load(Ordering::Relaxed);
assert!(before >= 1, "epoch starts at 1 so zeroinitializer never hits");
assert!(
before >= 1,
"epoch starts at 1 so zeroinitializer never hits"
);
GC_STATS.with(|stats| {
stats.borrow_mut().record_collection(0, 1);
});
Expand Down
2 changes: 1 addition & 1 deletion crates/perry-runtime/src/object/field_get_set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ pub(crate) use has_property::{
wide_key_index_note_hit, WIDE_KEY_INDEX_MIN_KEYS,
};
pub use has_property::{js_in_operator, js_object_has_property};
pub(crate) use ic_miss::pic_epoch_bump;
pub(crate) use ic_miss::{
is_array_method_value_name, is_primitive_proto_method, is_timer_handle_method_key,
set_method_value_name,
Expand All @@ -201,7 +202,6 @@ pub use ic_miss::{
js_object_get_field_ic_miss, js_object_set_field_by_property_id, js_private_brand_check,
js_private_guard, PERRY_IC_EPOCH,
};
pub(crate) use ic_miss::pic_epoch_bump;

#[cfg(test)]
mod buffer_ic_miss_tests {
Expand Down
Loading