Skip to content

Remove incorrect unsafe impl Send for Token { } #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2017
Merged

Remove incorrect unsafe impl Send for Token { } #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/tokenizer/interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ pub enum Token {
ParseError(Cow<'static, str>),
}

// FIXME: rust-lang/rust#22629
unsafe impl Send for Token { }

#[derive(Debug, PartialEq)]
#[must_use]
pub enum TokenSinkResult<Handle> {
Expand Down
8 changes: 4 additions & 4 deletions tests/tokenizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ fn unescape_json(js: &Json) -> Json {
}
}

fn mk_test(desc: String, input: String, expect: Vec<Token>, opts: TokenizerOpts)
fn mk_test(desc: String, input: String, expect: Json, opts: TokenizerOpts)
-> TestDescAndFn {
TestDescAndFn {
desc: TestDesc {
Expand All @@ -330,7 +330,8 @@ fn mk_test(desc: String, input: String, expect: Vec<Token>, opts: TokenizerOpts)
// result but the compiler doesn't catch it!
// Possibly mozilla/rust#12223.
let output = tokenize(input.clone(), opts.clone());
if output != expect {
let expect_toks = json_to_tokens(&expect, opts.exact_errors);
if output != expect_toks {
panic!("\ninput: {:?}\ngot: {:?}\nexpected: {:?}",
input, output, expect);
}
Expand Down Expand Up @@ -384,8 +385,7 @@ fn mk_tests(tests: &mut Vec<TestDescAndFn>, filename: &str, js: &Json) {
newdesc = format!("{} (exact errors)", newdesc);
}

let expect_toks = json_to_tokens(&expect, exact_errors);
tests.push(mk_test(newdesc, input.clone(), expect_toks, TokenizerOpts {
tests.push(mk_test(newdesc, input.clone(), expect.clone(), TokenizerOpts {
exact_errors: exact_errors,
initial_state: state,
last_start_tag_name: start_tag.clone(),
Expand Down