From 625bfae3be10a62d48b1f804c4ce238246ea8875 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 8 Dec 2023 10:12:27 -0500 Subject: [PATCH] stuff --- Cargo.lock | 32 ++++++++++++++++---------------- build.sh | 0 parsing/src/autocomplete.rs | 8 +------- parsing/src/lib.rs | 1 - parsing/src/splitting.rs | 1 + parsing/src/suggestions.rs | 5 ----- push.sh | 0 src/function_entry.rs | 3 --- src/lib.rs | 1 - start-server.sh | 0 10 files changed, 18 insertions(+), 33 deletions(-) mode change 100755 => 100644 build.sh mode change 100755 => 100644 push.sh mode change 100755 => 100644 start-server.sh diff --git a/Cargo.lock b/Cargo.lock index 3f52080..69acc0a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,7 +660,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecolor" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "bytemuck", "serde", @@ -669,7 +669,7 @@ dependencies = [ [[package]] name = "eframe" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "bytemuck", "cocoa", @@ -698,7 +698,7 @@ dependencies = [ [[package]] name = "egui" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "accesskit", "ahash", @@ -711,7 +711,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "arboard", "egui", @@ -726,7 +726,7 @@ dependencies = [ [[package]] name = "egui_glow" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "bytemuck", "egui", @@ -740,7 +740,7 @@ dependencies = [ [[package]] name = "egui_plot" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "egui", ] @@ -754,7 +754,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "bytemuck", "serde", @@ -774,7 +774,7 @@ dependencies = [ [[package]] name = "epaint" version = "0.24.1" -source = "git+https://github.com/titaniumtown/egui.git#72751efd6014422261ba24df9a606bece4470cb9" +source = "git+https://github.com/titaniumtown/egui.git#ffd7414780a6b4ef9f0c94d87c655a63c73cc272" dependencies = [ "ab_glyph", "ahash", @@ -1429,9 +1429,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -3133,9 +3133,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] @@ -3224,18 +3224,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.28" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" +checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.28" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" +checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" dependencies = [ "proc-macro2", "quote", diff --git a/build.sh b/build.sh old mode 100755 new mode 100644 diff --git a/parsing/src/autocomplete.rs b/parsing/src/autocomplete.rs index 4292376..f01f67b 100644 --- a/parsing/src/autocomplete.rs +++ b/parsing/src/autocomplete.rs @@ -1,4 +1,4 @@ -use std::{hint::unreachable_unchecked, intrinsics::assume}; +use std::hint::unreachable_unchecked; use crate::{generate_hint, Hint, HINT_EMPTY}; @@ -70,12 +70,6 @@ impl<'a> AutoComplete<'a> { // Impossible for plural hints to be singular or non-existant debug_assert!(hints.len() > 1); // check on debug - // Hint to the compiler - unsafe { - assume(hints.len() > 1); - assume(!hints.is_empty()); - } - match movement { Movement::Up => { // Wrap self.i to maximum `i` value if needed diff --git a/parsing/src/lib.rs b/parsing/src/lib.rs index 5632e51..dc63f86 100644 --- a/parsing/src/lib.rs +++ b/parsing/src/lib.rs @@ -1,5 +1,4 @@ #![feature(const_trait_impl)] -#![feature(core_intrinsics)] #![feature(const_mut_refs)] #![feature(const_for)] mod autocomplete; diff --git a/parsing/src/splitting.rs b/parsing/src/splitting.rs index 0663833..efeda1b 100644 --- a/parsing/src/splitting.rs +++ b/parsing/src/splitting.rs @@ -127,6 +127,7 @@ pub fn split_function_chars(chars: &[char], split: SplitType) -> Vec { // Append split if curr_c.splitable(c, &prev_char, &split) { + // create new buffer data.push(String::new()); last = unsafe { data.last_mut().unwrap_unchecked() }; } diff --git a/parsing/src/suggestions.rs b/parsing/src/suggestions.rs index 1381a80..ee2568b 100644 --- a/parsing/src/suggestions.rs +++ b/parsing/src/suggestions.rs @@ -1,5 +1,4 @@ use crate::{split_function_chars, SplitType}; -use std::intrinsics::assume; pub const HINT_EMPTY: Hint = Hint::Single("x^2"); const HINT_CLOSED_PARENS: Hint = Hint::Single(")"); @@ -20,10 +19,6 @@ pub fn generate_hint<'a>(input: &str) -> &'a Hint<'a> { } else { let chars: Vec = input.chars().collect::>(); - unsafe { - assume(!chars.is_empty()); - } - let key = get_last_term(&chars); match key { Some(key) => { diff --git a/push.sh b/push.sh old mode 100755 new mode 100644 diff --git a/src/function_entry.rs b/src/function_entry.rs index 1e37b8f..385e9e6 100644 --- a/src/function_entry.rs +++ b/src/function_entry.rs @@ -10,7 +10,6 @@ use serde::{ser::SerializeStruct, Deserialize, Deserializer, Serialize, Serializ use std::{ fmt::{self, Debug}, hash::{Hash, Hasher}, - intrinsics::assume, }; /// Represents the possible variations of Riemann Sums @@ -277,8 +276,6 @@ impl FunctionEntry { debug_assert!(resolution > 0.0); let resolution_iter = step_helper(settings.plot_width + 1, settings.min_x, resolution); - unsafe { assume(!resolution_iter.is_empty()) } - // Makes sure proper arguments are passed when integral is enabled if self.integral && settings.integral_changed { self.clear_integral(); diff --git a/src/lib.rs b/src/lib.rs index 5cbed1a..6236c85 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,6 @@ #![feature(const_mut_refs)] #![feature(let_chains)] #![feature(const_trait_impl)] -#![feature(core_intrinsics)] #![feature(const_fn_floating_point_arithmetic)] #![feature(const_assume)] #![feature(const_option_ext)] diff --git a/start-server.sh b/start-server.sh old mode 100755 new mode 100644