Skip to content

Commit

Permalink
Auto merge of #15701 - lnicola:rustc_layout_scalar_valid_range2, r=ln…
Browse files Browse the repository at this point in the history
…icola

fix: strip base prefix in `layout_scalar_valid_range`

CC https://github.com/rust-lang/rust-analyzer/pull/15688/files#r1342311078
  • Loading branch information
bors committed Oct 2, 2023
2 parents 0840038 + 084ee93 commit d7faec8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions crates/hir-ty/src/layout/adt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ fn layout_scalar_valid_range(db: &dyn HirDatabase, def: AdtId) -> (Bound<u128>,
for tree in attr {
if let Some(it) = tree.token_trees.first() {
let text = it.to_string().replace('_', "");
let base = match text.as_bytes() {
[b'0', b'x', ..] => 16,
[b'0', b'o', ..] => 8,
[b'0', b'b', ..] => 2,
_ => 10,
let (text, base) = match text.as_bytes() {
[b'0', b'x', ..] => (&text[2..], 16),
[b'0', b'o', ..] => (&text[2..], 8),
[b'0', b'b', ..] => (&text[2..], 2),
_ => (&*text, 10),
};

if let Ok(it) = u128::from_str_radix(&text, base) {
if let Ok(it) = u128::from_str_radix(text, base) {
return Bound::Included(it);
}
}
Expand Down

0 comments on commit d7faec8

Please sign in to comment.