Skip to content

Commit fd57efb

Browse files
committed
Auto merge of #139689 - jhpratt:rollup-wlkdyjg, r=jhpratt
Rollup of 7 pull requests Successful merges: - #137835 (Use `BinOp::Cmp` for `iNN::signum`) - #139584 (Avoid a reverse map that is only used in diagnostics paths) - #139638 (Cleanup the `InstSimplify` MIR transformation) - #139653 (Handle a negated literal in `eat_token_lit`.) - #139662 (Tweak `DefPathData`) - #139664 (Reuse address-space computation from global alloc) - #139687 (Add spastorino to users_on_vacation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 39ca0fd + b95f3ba commit fd57efb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

clippy_utils/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3504,7 +3504,7 @@ fn maybe_get_relative_path(from: &DefPath, to: &DefPath, max_super: usize) -> St
35043504
// a::b::c ::d::sym refers to
35053505
// e::f::sym:: ::
35063506
// result should be super::super::super::super::e::f
3507-
if let DefPathData::TypeNs(Some(s)) = l {
3507+
if let DefPathData::TypeNs(s) = l {
35083508
path.push(s.to_string());
35093509
}
35103510
if let DefPathData::TypeNs(_) = r {
@@ -3515,7 +3515,7 @@ fn maybe_get_relative_path(from: &DefPath, to: &DefPath, max_super: usize) -> St
35153515
// a::b::sym:: :: refers to
35163516
// c::d::e ::f::sym
35173517
// when looking at `f`
3518-
Left(DefPathData::TypeNs(Some(sym))) => path.push(sym.to_string()),
3518+
Left(DefPathData::TypeNs(sym)) => path.push(sym.to_string()),
35193519
// consider:
35203520
// a::b::c ::d::sym refers to
35213521
// e::f::sym:: ::
@@ -3529,7 +3529,7 @@ fn maybe_get_relative_path(from: &DefPath, to: &DefPath, max_super: usize) -> St
35293529
// `super` chain would be too long, just use the absolute path instead
35303530
once(String::from("crate"))
35313531
.chain(to.data.iter().filter_map(|el| {
3532-
if let DefPathData::TypeNs(Some(sym)) = el.data {
3532+
if let DefPathData::TypeNs(sym) = el.data {
35333533
Some(sym.to_string())
35343534
} else {
35353535
None

0 commit comments

Comments
 (0)