servo: Merge #18340 - Use the better TokenStream API in dom_struct (from servo:dom-struct-errors); r=SimonSapin

Before:

```rust
error[E0412]: cannot find type `SourceBuffer` in this scope
  --> /Users/nox/src/servo/components/script/dom/mediasource.rs:25:1
   |
25 | #[dom_struct]
   | ^^^^^^^^^^^^^ did you mean `SourceBufferList`?
```

After:

```rust
error[E0412]: cannot find type `SourceBuffer` in this scope
  --> /Users/nox/src/servo/components/script/dom/mediasource.rs:28:39
   |
28 |     source_buffers: DOMRefCell<Vec<JS<SourceBuffer>>>,
   |                                       ^^^^^^^^^^^^ did you mean `SourceBufferList`?
```

Source-Repo: https://github.com/servo/servo
Source-Revision: 32b04b3f517cebcba34a23e6930860bbedb1431b

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 32ff4a9079c10adbd780779a48557ac24d00427d
This commit is contained in:
Anthony Ramine 2017-09-02 00:48:29 -05:00
parent 6f4975a39c
commit 1f6d0698cc
3 changed files with 5 additions and 16 deletions

3
servo/Cargo.lock generated
View File

@ -743,9 +743,6 @@ dependencies = [
[[package]]
name = "dom_struct"
version = "0.0.1"
dependencies = [
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "domobject_derive"

View File

@ -8,6 +8,3 @@ publish = false
[lib]
path = "lib.rs"
proc-macro = true
[dependencies]
quote = "0.3.15"

View File

@ -5,24 +5,19 @@
#![feature(proc_macro)]
extern crate proc_macro;
#[macro_use] extern crate quote;
use proc_macro::TokenStream;
use proc_macro::{TokenStream, quote};
use std::iter;
#[proc_macro_attribute]
pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream {
if !args.to_string().is_empty() {
if !args.is_empty() {
panic!("#[dom_struct] takes no arguments");
}
expand_string(&input.to_string()).parse().unwrap()
}
fn expand_string(input: &str) -> String {
let mut tokens = quote! {
let attributes = quote! {
#[derive(DenyPublicFields, DomObject, HeapSizeOf, JSTraceable)]
#[must_root]
#[repr(C)]
};
tokens.append(input);
tokens.to_string()
iter::once(attributes).chain(iter::once(input)).collect()
}