feat: upper- or lowercase hexadecimal literals

Author: ArjenL

Diff for: Configurations.md

@@ -1047,6 +1047,13 @@ fn lorem() -> usize {
 
 See also: [`tab_spaces`](#tab_spaces).
 
+## `hex_literal_case`
+
+Change the case of the letters in hexadecimal literal values
+
+- **Default value**: `Ignore`
+- **Possible values**: `ToUpper`, `ToLower`
+- **Stable**: No
 
 ## `hide_parse_errors`
 

Diff for: src/config/mod.rs

@@ -69,6 +69,8 @@ create_config! {
     format_macro_matchers: bool, false, false,
         "Format the metavariable matching patterns in macros";
     format_macro_bodies: bool, true, false, "Format the bodies of macros";
+    hex_literal_case: HexLiteralCase, HexLiteralCase::Ignore, false,
+        "Format hexadecimal integer literals";
 
     // Single line expressions and items
     empty_item_single_line: bool, true, false,
@@ -569,6 +571,7 @@ license_template_path = ""
 format_strings = false
 format_macro_matchers = false
 format_macro_bodies = true
+hex_literal_case = "Ignore"
 empty_item_single_line = true
 struct_lit_single_line = true
 fn_single_line = false

Diff for: src/config/options.rs

@@ -127,6 +127,17 @@ pub enum ImportGranularity {
     Item,
 }
 
+/// Controls how rustfmt should handle case in hexadecimal literals.
+#[config_type]
+pub enum HexLiteralCase {
+    /// Leave the literal as-is
+    Ignore,
+    /// Uppercase the literal
+    ToUpper,
+    /// Lowercase the literal
+    ToLower,
+}
+
 #[config_type]
 pub enum ReportTactic {
     Always,

Diff for: src/expr.rs

@@ -13,7 +13,7 @@ use crate::comment::{
     rewrite_missing_comment, CharClasses, FindUncommented,
 };
 use crate::config::lists::*;
-use crate::config::{Config, ControlBraceStyle, IndentStyle, Version};
+use crate::config::{Config, ControlBraceStyle, HexLiteralCase, IndentStyle, Version};
 use crate::lists::{
     definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
     struct_lit_tactic, write_list, ListFormatting, Separator,
@@ -1176,6 +1176,7 @@ pub(crate) fn rewrite_literal(
 ) -> Option<String> {
     match l.kind {
         ast::LitKind::Str(_, ast::StrStyle::Cooked) => rewrite_string_lit(context, l.span, shape),
+        ast::LitKind::Int(..) => rewrite_int_lit(context, l),
         _ => wrap_str(
             context.snippet(l.span).to_owned(),
             context.config.max_width(),
@@ -1210,6 +1211,28 @@ fn rewrite_string_lit(context: &RewriteContext<'_>, span: Span, shape: Shape) ->
     )
 }
 
+fn rewrite_int_lit(context: &RewriteContext<'_>, lit: &ast::Lit) -> Option<String> {
+    let span = lit.span;
+    let symbol = lit.token.symbol.as_str();
+
+    if symbol.starts_with("0x") {
+        let hex_lit = match context.config.hex_literal_case() {
+            HexLiteralCase::Ignore => None,
+            HexLiteralCase::ToUpper => Some(symbol[2..].to_ascii_uppercase()),
+            HexLiteralCase::ToLower => Some(symbol[2..].to_ascii_lowercase()),
+        };
+        if let Some(hex_lit) = hex_lit {
+            return Some(format!(
+                "0x{}{}",
+                hex_lit,
+                lit.token.suffix.map_or(String::new(), |s| s.to_string())
+            ));
+        }
+    }
+
+    Some(context.snippet(span).to_owned())
+}
+
 fn choose_separator_tactic(context: &RewriteContext<'_>, span: Span) -> Option<SeparatorTactic> {
     if context.inside_macro() {
         if span_ends_with_comma(context, span) {

Diff for: tests/source/hex_literal_lower.rs

@@ -0,0 +1,5 @@
+// rustfmt-hex_literal_case: ToLower
+fn main() {
+    let h1 = 0xCAFE_5EA7;
+    let h2 = 0xCAFE_F00Du32;
+}

Diff for: tests/source/hex_literal_upper.rs

@@ -0,0 +1,5 @@
+// rustfmt-hex_literal_case: ToUpper
+fn main() {
+    let h1 = 0xCAFE_5EA7;
+    let h2 = 0xCAFE_F00Du32;
+}

Diff for: tests/target/hex_literal_ignore.rs

@@ -0,0 +1,5 @@
+// rustfmt-hex_literal_case: Ignore
+fn main() {
+    let h1 = 0xcAfE_5Ea7;
+    let h2 = 0xCaFe_F00du32;
+}

Diff for: tests/target/hex_literal_lower.rs

@@ -0,0 +1,5 @@
+// rustfmt-hex_literal_case: ToLower
+fn main() {
+    let h1 = 0xcafe_5ea7;
+    let h2 = 0xcafe_f00du32;
+}

Diff for: tests/target/hex_literal_upper.rs

@@ -0,0 +1,5 @@
+// rustfmt-hex_literal_case: ToUpper
+fn main() {
+    let h1 = 0xCAFE_5EA7;
+    let h2 = 0xCAFE_F00Du32;
+}