Skip to content

Commit eee277d

Browse files
committed
Auto merge of #153116 - jhpratt:rollup-yjBVB1Y, r=jhpratt
Rollup of 13 pull requests Successful merges: - rust-lang/rust#148146 (CI: use alternative disks if available) - rust-lang/rust#151771 (Fix: On wasm targets, call `panic_in_cleanup` if panic occurs in cleanup) - rust-lang/rust#153035 (rustc_target: callconv: powerpc64: Use llvm_abiname rather than target_abi for ABI determination) - rust-lang/rust#153075 (mGCA: Lower negated literals directly and reject non-integer negations) - rust-lang/rust#153078 (Remove `QuerySystemFns`) - rust-lang/rust#153089 (interpret: avoid dummy spans in the stacktrace) - rust-lang/rust#153111 (Refactor url_parts to return is_absolute instead of out param) - rust-lang/rust#149978 (deprecate `Eq::assert_receiver_is_total_eq` and emit FCW on manual impls) - rust-lang/rust#153029 (Rename `rustc::pass_by_value` lint as `rustc::disallowed_pass_by_ref`.) - rust-lang/rust#153063 (`is_ty_must_use`: do not require a `span` argument) - rust-lang/rust#153071 (Update books) - rust-lang/rust#153092 (Remove redundant self usages) - rust-lang/rust#153094 (Simplify `AppendOnlyVec` iterators) Failed merges: - rust-lang/rust#153091 (Migration of `LintDiagnostic` - part 4)
2 parents 28e3ea5 + fd9820c commit eee277d

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

crates/base-db/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub use crate::{
3232
},
3333
};
3434
use dashmap::{DashMap, mapref::entry::Entry};
35-
pub use query_group::{self};
35+
pub use query_group;
3636
use rustc_hash::{FxHashSet, FxHasher};
3737
use salsa::{Durability, Setter};
3838
pub use semver::{BuildMetadata, Prerelease, Version, VersionReq};

crates/hir-expand/src/builtin/fn_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use cfg::CfgExpr;
77
use either::Either;
88
use intern::{
99
Symbol,
10-
sym::{self},
10+
sym,
1111
};
1212
use itertools::Itertools;
1313
use mbe::{DelimiterKind, expect_fragment};

crates/hir-ty/src/lower.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use rustc_hash::FxHashSet;
4040
use rustc_type_ir::{
4141
AliasTyKind, BoundVarIndexKind, ConstKind, DebruijnIndex, ExistentialPredicate,
4242
ExistentialProjection, ExistentialTraitRef, FnSig, Interner, OutlivesPredicate, TermKind,
43-
TyKind::{self},
43+
TyKind,
4444
TypeFoldable, TypeVisitableExt, Upcast, UpcastFrom, elaborate,
4545
inherent::{Clause as _, GenericArgs as _, IntoKind as _, Region as _, Ty as _},
4646
};

crates/ide-assists/src/handlers/promote_local_to_const.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use syntax::{
88

99
use crate::{
1010
assist_context::{AssistContext, Assists},
11-
utils::{self},
11+
utils,
1212
};
1313

1414
// Assist: promote_local_to_const

crates/rust-analyzer/src/tracing/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Simple logger that logs either to stderr or to a file, using `tracing_subscriber`
22
//! filter syntax and `tracing_appender` for non blocking output.
33
4-
use std::io::{self};
4+
use std::io;
55

66
use anyhow::Context;
77
use tracing::level_filters::LevelFilter;

0 commit comments

Comments
 (0)