Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into complex_format
  • Loading branch information
yt2b committed Jul 4, 2025
commit ecc7ae4434fa6fbc463be5f0527c0906a1cc8505
14 changes: 5 additions & 9 deletions vm/src/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,15 @@ impl IntoPyException for FormatSpecError {
let msg = format!("{s} not allowed with integer format specifier 'c'");
vm.new_value_error(msg)
}
FormatSpecError::UnableToConvert => {
vm.new_value_error("Unable to convert int to float")
}
FormatSpecError::CodeNotInRange => {
vm.new_overflow_error("%c arg not in range(0x110000)")
}
FormatSpecError::ZeroPaddingNotAllowed => {
Self::UnableToConvert => vm.new_value_error("Unable to convert int to float"),
Self::CodeNotInRange => vm.new_overflow_error("%c arg not in range(0x110000)"),
Self::ZeroPaddingNotAllowed => {
vm.new_value_error("Zero padding is not allowed in complex format specifier")
}
FormatSpecError::AlignmentFlagNotAllowed => {
Self::AlignmentFlagNotAllowed => {
vm.new_value_error("'=' alignment flag is not allowed in complex format specifier")
}
FormatSpecError::NotImplemented(c, s) => {
Self::NotImplemented(c, s) => {
let msg = format!("Format code '{c}' for object of type '{s}' not implemented yet");
vm.new_value_error(msg)
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.