Let spans be lifetime free.

This commit is contained in:
2026-11-13 21:01:56 +01:00
parent ef5df823eb
commit a33cce2592
3 changed files with 20 additions and 23 deletions
+13 -17
View File
@@ -1,39 +1,35 @@
#[derive(Debug, PartialEq, Eq)]
pub struct Span<'a> {
pub struct Span {
start: usize,
raw: &'a str,
end: usize,
}
impl<'a> Span<'a> {
pub fn new(start: usize, raw: &'a str) -> Self {
Span { start, raw }
impl Span {
pub fn new(start: usize, end: usize) -> Self {
Span { start, end }
}
pub fn start(&self) -> usize {
self.start
}
pub fn raw(&self) -> &'a str {
self.raw
pub fn end(&self) -> usize {
self.end
}
pub fn len(&self) -> usize {
self.raw.len()
}
pub fn end(&self) -> usize {
self.start + self.raw.len()
self.end - self.start
}
}
#[derive(Debug, PartialEq, Eq)]
pub struct Spanned<'a, T> {
pub struct Spanned<T> {
node: T,
span: Span<'a>,
span: Span,
}
impl<'a, T> Spanned<'a, T> {
pub fn new(node: T, span: Span<'a>) -> Self {
impl<T> Spanned<T> {
pub fn new(node: T, span: Span) -> Self {
Spanned { node, span }
}
@@ -41,7 +37,7 @@ impl<'a, T> Spanned<'a, T> {
&self.node
}
pub fn span(&self) -> &Span<'a> {
pub fn span(&self) -> &Span {
&self.span
}
}