diff --git a/libgrust/libformat_parser/Cargo.toml b/libgrust/libformat_parser/Cargo.toml
index 3c214915d31..39c017d249b 100644
--- a/libgrust/libformat_parser/Cargo.toml
+++ b/libgrust/libformat_parser/Cargo.toml
@@ -14,7 +14,7 @@ libc = "0.2"
 generic_format_parser = { path = "generic_format_parser" }
 
 [lib]
-crate_type = ["staticlib", "rlib"]
+crate-type = ["staticlib", "rlib"]
 
 [[bin]]
 name = "format_parser_test"
diff --git a/libgrust/libformat_parser/generic_format_parser/src/lib.rs b/libgrust/libformat_parser/generic_format_parser/src/lib.rs
index e255bf16908..25f6b0ead17 100644
--- a/libgrust/libformat_parser/generic_format_parser/src/lib.rs
+++ b/libgrust/libformat_parser/generic_format_parser/src/lib.rs
@@ -22,22 +22,6 @@ fn is_id_continue(c: char) -> bool {
     unicode_xid::UnicodeXID::is_xid_continue(c)
 }
 
-// Workaround for Ubuntu 18.04. The default Rust package is 1.65 (and unlikely to change I assume?), but the
-// generic format parser library uses `is_some_and` which was introduced in 1.70. So this is a reimplementation,
-// directly taken from the standard library sources
-trait IsSomeAnd<T> {
-    fn is_some_and(self, f: impl FnOnce(T) -> bool) -> bool;
-}
-
-impl<T> IsSomeAnd<T> for Option<T> {
-    fn is_some_and(self, f: impl FnOnce(T) -> bool) -> bool {
-        match self {
-            None => false,
-            Some(x) => f(x),
-        }
-    }
-}
-
 // use rustc_lexer::unescape;
 pub use Alignment::*;
 pub use Count::*;
diff --git a/libgrust/libformat_parser/src/lib.rs b/libgrust/libformat_parser/src/lib.rs
index 0769577740f..f4670bf9b1f 100644
--- a/libgrust/libformat_parser/src/lib.rs
+++ b/libgrust/libformat_parser/src/lib.rs
@@ -5,16 +5,6 @@
 
 use std::ffi::CStr;
 
-trait StringLeakExt {
-    fn leak<'a>(self) -> &'a mut str;
-}
-
-impl StringLeakExt for String {
-    fn leak<'a>(self) -> &'a mut str {
-        Box::leak(self.into_boxed_str())
-    }
-}
-
 trait IntoFFI<T> {
     fn into_ffi(self) -> T;
 }
@@ -98,10 +88,6 @@ mod ffi {
     //     InlineAsm,
     // }
 
-    #[derive(Copy, Clone)]
-    #[repr(C)]
-    struct InnerOffset(usize);
-
     /// A piece is a portion of the format string which represents the next part
     /// to emit. These are emitted as a stream by the `Parser` class.
     #[derive(Debug, Clone, PartialEq)]