Skip to content

Commit e3697cb

Browse files
author
bors-servo
authored
Auto merge of #124 - emilio:unbox-tokenizer, r=SimonSapin
Don't heap-allocate a tokenizer for top-level parsing. r? @SimonSapin <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-cssparser/124) <!-- Reviewable:end -->
2 parents 291d79c + 13662ef commit e3697cb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "cssparser"
4-
version = "0.12.0"
4+
version = "0.12.1"
55
authors = [ "Simon Sapin <[email protected]>" ]
66

77
description = "Rust implementation of CSS Syntax Level 3"

src/parser.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub struct SourcePosition {
2727
/// * The Owned variant is boxed
2828
/// * The Borrowed variant contains a mutable reference.
2929
enum MaybeOwned<'a, T: 'a> {
30-
Owned(Box<T>),
30+
Owned(T),
3131
Borrowed(&'a mut T),
3232
}
3333

@@ -36,7 +36,7 @@ impl<'a, T> ops::Deref for MaybeOwned<'a, T> {
3636

3737
fn deref<'b>(&'b self) -> &'b T {
3838
match *self {
39-
MaybeOwned::Owned(ref pointer) => &**pointer,
39+
MaybeOwned::Owned(ref t) => t,
4040
MaybeOwned::Borrowed(ref pointer) => &**pointer,
4141
}
4242
}
@@ -45,15 +45,15 @@ impl<'a, T> ops::Deref for MaybeOwned<'a, T> {
4545
impl<'a, T> ops::DerefMut for MaybeOwned<'a, T> {
4646
fn deref_mut<'b>(&'b mut self) -> &'b mut T {
4747
match *self {
48-
MaybeOwned::Owned(ref mut pointer) => &mut **pointer,
48+
MaybeOwned::Owned(ref mut t) => t,
4949
MaybeOwned::Borrowed(ref mut pointer) => &mut **pointer,
5050
}
5151
}
5252
}
5353

5454
impl<'a, T> Clone for MaybeOwned<'a, T> where T: Clone {
5555
fn clone(&self) -> MaybeOwned<'a, T> {
56-
MaybeOwned::Owned(Box::new((**self).clone()))
56+
MaybeOwned::Owned((**self).clone())
5757
}
5858
}
5959

@@ -171,7 +171,7 @@ impl<'i, 't> Parser<'i, 't> {
171171
#[inline]
172172
pub fn new(input: &'i str) -> Parser<'i, 'i> {
173173
Parser {
174-
tokenizer: MaybeOwned::Owned(Box::new(Tokenizer::new(input))),
174+
tokenizer: MaybeOwned::Owned(Tokenizer::new(input)),
175175
at_start_of: None,
176176
stop_before: Delimiter::None,
177177
}

0 commit comments

Comments
 (0)