From 3e8cffe1a5ff9cd499520cc09fa0b049f8b4db81 Mon Sep 17 00:00:00 2001 From: ondra05 Date: Tue, 3 May 2022 23:19:10 +0200 Subject: [PATCH] fmt + clippy --- ablescript/src/lexer.rs | 10 +++++----- ablescript/src/variables.rs | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ablescript/src/lexer.rs b/ablescript/src/lexer.rs index c6b6e67..df7ad25 100644 --- a/ablescript/src/lexer.rs +++ b/ablescript/src/lexer.rs @@ -143,26 +143,26 @@ fn get_string(lexer: &mut Lexer) -> Option { let mut slice = &lexer.slice()[2..]; while let Some(escape_start) = slice.find('"') { // Push predeceasing string - string.push_str(&slice.get(..escape_start)?); + string.push_str(slice.get(..escape_start)?); // Move slice behind escape start delimiter - slice = &slice.get(escape_start + 1..)?; + slice = slice.get(escape_start + 1..)?; // Get escape end delimiter position and parse string before it to // a character from it's unicode value (base-12) and push it to string let escape_end = slice.find('"')?; string.push( - u32::from_str_radix(&slice.get(..escape_end)?, 12) + u32::from_str_radix(slice.get(..escape_end)?, 12) .ok() .and_then(char::from_u32)?, ); // Move slice behind escape end delimiter - slice = &slice.get(escape_end + 1..)?; + slice = slice.get(escape_end + 1..)?; } // Push remaining string - string.push_str(&slice); + string.push_str(slice); lexer.bump(2); Some(string) diff --git a/ablescript/src/variables.rs b/ablescript/src/variables.rs index f6356a3..3627a22 100644 --- a/ablescript/src/variables.rs +++ b/ablescript/src/variables.rs @@ -1,3 +1,5 @@ +use crate::{ast::Block, brian::INSTRUCTION_MAPPINGS, consts}; +use rand::Rng; use std::{ cell::{Ref, RefCell, RefMut}, collections::HashMap, @@ -10,10 +12,6 @@ use std::{ vec, }; -use rand::Rng; - -use crate::{ast::Block, brian::INSTRUCTION_MAPPINGS, consts}; - #[derive(Debug, Clone, Copy, PartialEq, PartialOrd)] pub enum Abool { Never = -1,