diff options
| author | Nathan Reiner <nathan@nathanreiner.xyz> | 2024-08-01 22:07:04 +0200 |
|---|---|---|
| committer | Nathan Reiner <nathan@nathanreiner.xyz> | 2024-08-01 22:07:04 +0200 |
| commit | 1e1eb95926f556e666bc20355327abd24d264858 (patch) | |
| tree | e40b68da80b984355baf68a36983d78bb2ec63dd /src/sheet | |
| parent | 5d15bed762c4c699bebc9b5f5e302fa61785ed51 (diff) | |
minor cleanup
Diffstat (limited to 'src/sheet')
| -rw-r--r-- | src/sheet/cell.rs | 4 | ||||
| -rw-r--r-- | src/sheet/mod.rs | 6 | ||||
| -rw-r--r-- | src/sheet/register.rs | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/sheet/cell.rs b/src/sheet/cell.rs index 9608b93..3b18bde 100644 --- a/src/sheet/cell.rs +++ b/src/sheet/cell.rs @@ -89,6 +89,10 @@ pub struct CellRef { } impl CellRef { + /// # Safety + /// + /// This function shall only be called by the Sheet instance itsself or + /// if it has been assured that the `SheetId` is valid. pub unsafe fn new(sheet_id: SheetId, row: usize, column: usize, cell: Cell) -> Self { Self { sheet_id, diff --git a/src/sheet/mod.rs b/src/sheet/mod.rs index 11f95c9..f67d55e 100644 --- a/src/sheet/mod.rs +++ b/src/sheet/mod.rs @@ -30,9 +30,9 @@ impl Sheet { } } - pub fn get_cell<'a>(&'a self, row: usize, column: usize) -> Option<&'a Cell> { + pub fn get_cell(&self, row: usize, column: usize) -> Option<&Cell> { if let Some(r) = self.rows.get(row) { - if let Some(_) = r.get(column) { + if r.get(column).is_some() { return Some(&self.rows[row][column]); } } @@ -57,7 +57,7 @@ impl Sheet { } pub fn width(&self) -> usize { - self.rows.get(0).map(|r| r.len()).unwrap_or(1) + self.rows.first().map(|r| r.len()).unwrap_or(1) } pub fn set_width(&mut self, mut width: usize) { diff --git a/src/sheet/register.rs b/src/sheet/register.rs index aa5245b..4fca3a3 100644 --- a/src/sheet/register.rs +++ b/src/sheet/register.rs @@ -21,7 +21,7 @@ impl Register { id } - pub fn get<'a>(id: SheetId) -> Option<Arc<RwLock<Sheet>>> { + pub fn get(id: SheetId) -> Option<Arc<RwLock<Sheet>>> { let register = REGISTER.read().unwrap(); if id < register.len() { @@ -45,7 +45,7 @@ impl UserData for Register { }); methods.add_function_mut("get", |lua, id: SheetId| { - if let Some(_) = Register::get(id) { + if Register::get(id).is_some() { let luaref = SheetLuaRef::new(id); if let Ok(ud) = lua.create_userdata(luaref) { Ok(Value::UserData(ud)) |