Skip to content

fix(zellij-server): unblock building on 32bit targets #4484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −5
Open

fix(zellij-server): unblock building on 32bit targets #4484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions zellij-server/src/panes/terminal_character.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,12 @@ impl NamedColor {
}

// This enum carefully only has two variants so
// enum niche optimisations can keep it to 8 bytes
// enum niche optimisations can keep it at the same byte size as pointers
#[derive(Clone, Debug, PartialEq)]
pub enum RcCharacterStyles {
Reset,
Rc(Rc<CharacterStyles>),
}
const _: [(); 8] = [(); std::mem::size_of::<RcCharacterStyles>()];

impl From<CharacterStyles> for RcCharacterStyles {
fn from(styles: CharacterStyles) -> Self {
Expand Down Expand Up @@ -920,15 +919,14 @@ impl Cursor {
}
}

// The size of this has significant memory and CPU implications for long lines,
// be careful about allowing it to grow
#[derive(Clone, PartialEq)]
pub struct TerminalCharacter {
pub character: char,
pub styles: RcCharacterStyles,
width: u8,
}
// This size has significant memory and CPU implications for long lines,
// be careful about allowing it to grow
const _: [(); 16] = [(); std::mem::size_of::<TerminalCharacter>()];

impl TerminalCharacter {
#[inline]
Expand Down
Loading