2014-07-01 12:02:50 +00:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
|
2017-02-21 13:15:15 +00:00
|
|
|
#![deny(unsafe_code)]
|
2016-03-11 21:12:10 +00:00
|
|
|
#![feature(box_patterns)]
|
2015-02-12 18:06:50 +00:00
|
|
|
#![feature(box_syntax)]
|
2016-08-20 18:35:04 +00:00
|
|
|
#![feature(conservative_impl_trait)]
|
2015-12-30 04:34:14 +00:00
|
|
|
#![feature(nonzero)]
|
2015-06-25 18:03:15 +00:00
|
|
|
#![feature(raw)]
|
2015-07-24 03:20:49 +00:00
|
|
|
#![feature(step_by)]
|
2014-07-01 12:02:50 +00:00
|
|
|
|
2015-09-30 21:19:33 +00:00
|
|
|
extern crate app_units;
|
2017-01-04 03:20:59 +00:00
|
|
|
extern crate atomic_refcell;
|
2015-09-23 21:02:56 +00:00
|
|
|
#[macro_use]
|
|
|
|
|
extern crate bitflags;
|
2015-05-20 20:42:06 +00:00
|
|
|
extern crate canvas_traits;
|
2015-12-30 04:34:14 +00:00
|
|
|
extern crate core;
|
2015-03-31 16:39:56 +00:00
|
|
|
extern crate cssparser;
|
2015-06-19 02:50:22 +00:00
|
|
|
extern crate euclid;
|
2015-09-23 21:02:56 +00:00
|
|
|
extern crate fnv;
|
2015-03-31 16:39:56 +00:00
|
|
|
extern crate gfx;
|
2015-05-20 20:42:06 +00:00
|
|
|
extern crate gfx_traits;
|
2016-02-04 22:10:36 +00:00
|
|
|
extern crate heapsize;
|
servo: Merge #14043 - Update to string-cache 0.3 (from servo:string-cache-up); r=nox
Previously, `string-cache` defined:
* An string-like `Atom` type,
* An `atom!("foo")` macro that expands to a value of that type, for a set of strings known at compile-time,
* A `struct Namespace(Atom);` type
* A `ns!(html)` macro that maps known prefixed to `Namespace` values with the corresponding namespace URL.
Adding a string to the static set required making a change to the `string-cache` crate.
With 0.3, the `Atom` type is now generic, with a type parameter that provides a set of static strings. We can have multiple such sets, defined in different crates. The `string_cache_codegen` crate, to be used in build scripts, generates code that defines such a set, a new atom type (a type alias for `Atom<_>` with the type parameter set), and an `atom!`-like macro.
The html5ever repository has a new `html5ever_atoms` crate that defines three such types: `Prefix`, `Namespace`, and `LocalName` (with respective `namespace_prefix!`, `namespace_url!`, and `local_name!` macros). It also defines the `ns!` macro like before.
This repository has a new `servo_atoms` crate in `components/atoms` that, for now, defines a single `Atom` type (and `atom!`) macro. (`servo_atoms::Atom` is defined as something like `type Atom = string_cache::Atom<ServoStaticStringSet>;`, so overall there’s now two types named `Atom`.)
In this PR, `servo_atoms::Atom` is used for everything else that was `string_cache::Atom` before. But more atom types can be defined as needed. Two reasons to do this are to auto-generate the set of static strings (I’m planning to do this for CSS property names, which is the motivation for this change), or to have the type system help us avoid mix up unrelated things (this is why we had a `Namespace` type ever before this change).
Introducing new types helped me find a bug: when creating a new attribute `dom::Element::set_style_attr`, would pass `Some(atom!("style"))` instead of `None` (now `Option<html5ever_atoms::Prefix>` instead of `Option<string_cache::Atom>`) to the `prefix` argument of `Attr::new`. I suppose the author of that code confused it with the `local_name` argument.
---
Note that Stylo is not affected by any of this. The `gecko_string_cache` module is unchanged, with a single `Atom` type. The `style` crate conditionally compiles `Prefix` and `LocalName` re-exports for that are both `gecko_string_cache::Atom` on stylo.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Source-Repo: https://github.com/servo/servo
Source-Revision: 5b4cc9568dbd5c15e5d2fbc62719172f11566ffa
2016-11-03 16:19:44 +00:00
|
|
|
#[macro_use] extern crate html5ever_atoms;
|
2015-07-14 14:46:07 +00:00
|
|
|
extern crate ipc_channel;
|
2014-07-01 12:02:50 +00:00
|
|
|
extern crate libc;
|
2015-11-28 14:04:11 +00:00
|
|
|
#[macro_use]
|
|
|
|
|
extern crate log;
|
2015-03-31 16:39:56 +00:00
|
|
|
extern crate msg;
|
2015-09-23 21:02:56 +00:00
|
|
|
extern crate net_traits;
|
2016-08-09 15:13:30 +00:00
|
|
|
extern crate ordered_float;
|
2016-11-01 23:26:20 +00:00
|
|
|
extern crate parking_lot;
|
2015-11-28 14:04:11 +00:00
|
|
|
extern crate profile_traits;
|
2016-02-26 02:11:57 +00:00
|
|
|
#[macro_use]
|
|
|
|
|
extern crate range;
|
2016-11-14 20:47:21 +00:00
|
|
|
extern crate rayon;
|
2016-06-20 17:54:20 +00:00
|
|
|
extern crate script_layout_interface;
|
2015-03-31 16:39:56 +00:00
|
|
|
extern crate script_traits;
|
2016-11-07 08:15:03 +00:00
|
|
|
extern crate serde;
|
|
|
|
|
#[macro_use]
|
|
|
|
|
extern crate serde_derive;
|
|
|
|
|
extern crate serde_json;
|
2016-12-15 00:48:42 +00:00
|
|
|
extern crate servo_config;
|
2017-01-17 15:18:42 +00:00
|
|
|
extern crate servo_geometry;
|
2016-11-17 21:34:47 +00:00
|
|
|
extern crate servo_url;
|
2015-06-10 14:23:11 +00:00
|
|
|
extern crate smallvec;
|
2015-03-31 16:39:56 +00:00
|
|
|
extern crate style;
|
2016-02-16 11:20:20 +00:00
|
|
|
extern crate style_traits;
|
2015-07-24 03:20:49 +00:00
|
|
|
extern crate unicode_bidi;
|
2015-09-29 21:37:11 +00:00
|
|
|
extern crate unicode_script;
|
2016-02-18 19:24:06 +00:00
|
|
|
extern crate webrender_traits;
|
2014-07-01 12:02:50 +00:00
|
|
|
|
2015-09-23 21:02:56 +00:00
|
|
|
#[macro_use]
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod layout_debug;
|
2014-09-08 06:33:09 +00:00
|
|
|
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod animation;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod block;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod construct;
|
|
|
|
|
pub mod context;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod data;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod display_list_builder;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod flex;
|
|
|
|
|
mod floats;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod flow;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod flow_list;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod flow_ref;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod fragment;
|
|
|
|
|
mod generated_content;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod incremental;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod inline;
|
2016-06-29 20:37:42 +00:00
|
|
|
mod linked_list;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod list_item;
|
|
|
|
|
mod model;
|
|
|
|
|
mod multicol;
|
2017-03-02 19:43:17 +00:00
|
|
|
pub mod opaque_node;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod parallel;
|
2016-02-20 18:45:19 +00:00
|
|
|
mod persistent_list;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod query;
|
|
|
|
|
pub mod sequential;
|
2015-11-18 14:03:36 +00:00
|
|
|
mod table;
|
|
|
|
|
mod table_caption;
|
|
|
|
|
mod table_cell;
|
|
|
|
|
mod table_colgroup;
|
|
|
|
|
mod table_row;
|
|
|
|
|
mod table_rowgroup;
|
|
|
|
|
mod table_wrapper;
|
|
|
|
|
mod text;
|
2016-06-20 22:00:13 +00:00
|
|
|
pub mod traversal;
|
|
|
|
|
pub mod webrender_helpers;
|
|
|
|
|
pub mod wrapper;
|
2016-03-30 02:19:25 +00:00
|
|
|
|
|
|
|
|
// For unit tests:
|
|
|
|
|
pub use fragment::Fragment;
|
2016-09-27 00:02:26 +00:00
|
|
|
pub use fragment::SpecificFragmentInfo;
|