chore: Run x fmt after rebase, should probably squash.

Author: futile

compiler/rustc_expand/src/derive_macro_expansion.rs

@@ -4,8 +4,8 @@ use std::ptr::{self, NonNull};
 use rustc_ast::tokenstream::TokenStream;
 use rustc_data_structures::svh::Svh;
 use rustc_middle::ty::TyCtxt;
-use rustc_span::profiling::SpannedEventArgRecorder;
 use rustc_span::LocalExpnId;
+use rustc_span::profiling::SpannedEventArgRecorder;
 
 use crate::base::ExtCtxt;
 use crate::errors;

compiler/rustc_middle/src/query/mod.rs

@@ -43,7 +43,7 @@ use rustc_session::lint::LintExpectationId;
 use rustc_span::def_id::LOCAL_CRATE;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::Symbol;
-use rustc_span::{LocalExpnId, DUMMY_SP, Span};
+use rustc_span::{DUMMY_SP, LocalExpnId, Span};
 use rustc_target::spec::PanicStrategy;
 use {rustc_abi as abi, rustc_ast as ast, rustc_attr as attr, rustc_hir as hir};