Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 21:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18029 - lnicola:minor-stuff, r=lnicola

Browse source 
minor: fix two nits
This commit is contained in:
bors 2024-09-02 17:07:43 +00:00
commit 304e5f58cd
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/hir-ty/src/consteval.rs
View file

@ -287,7 +287,7 @@ pub(crate) fn const_eval_discriminant_variant(
}
let repr = db.enum_data(loc.parent).repr;
let is_signed = repr.and_then(|repr| repr.int).is_none_or(|int| int.is_signed());
let is_signed = IsNoneOr::is_none_or(repr.and_then(|repr| repr.int), |int| int.is_signed());
let mir_body = db.monomorphized_mir_body(
def,

9
crates/ide-assists/src/handlers/toggle_macro_delimiter.rs
View file

@ -64,12 +64,9 @@ pub(crate) fn toggle_macro_delimiter(acc: &mut Assists, ctx: &AssistContext<'_>)
acc.add(
AssistId("toggle_macro_delimiter", AssistKind::Refactor),
match token {
MacroDelims::LPar => "Replace delimiters with braces",
MacroDelims::RPar => "Replace delimiters with braces",
MacroDelims::LBra => "Replace delimiters with parentheses",
MacroDelims::RBra => "Replace delimiters with parentheses",
MacroDelims::LCur => "Replace delimiters with brackets",
MacroDelims::RCur => "Replace delimiters with brackets",
MacroDelims::LPar | MacroDelims::RPar => "Replace delimiters with braces",
MacroDelims::LBra | MacroDelims::RBra => "Replace delimiters with parentheses",
MacroDelims::LCur | MacroDelims::RCur => "Replace delimiters with brackets",
},
token_tree.syntax().text_range(),
|builder| {