Backed out 2 changesets (bug 1475197) for causing linux build bustages because of compile errors. (fdafc33d) · Commits · The Tor Project / Applications / Tor Browser

Cargo.lock

+0 −9

Original line number	Diff line number	Diff line
		@@ -1151,7 +1151,6 @@ dependencies = [
		"servo_arc 0.1.1",
		"smallbitvec 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
		"smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
		"thin-slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
		"void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
		]

		@@ -1821,7 +1820,6 @@ dependencies = [
		"precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
		"servo_arc 0.1.1",
		"smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
		"thin-slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
		]

		[[package]]
		@@ -1989,7 +1987,6 @@ dependencies = [
		"smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
		"style_derive 0.0.1",
		"style_traits 0.0.1",
		"thin-slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
		"time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
		"toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
		"uluru 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
		@@ -2119,11 +2116,6 @@ dependencies = [
		"unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
		]

		[[package]]
		name = "thin-slice"
		version = "0.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"

		[[package]]
		name = "thread_local"
		version = "0.3.5"
		@@ -2745,7 +2737,6 @@ dependencies = [
		"checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209"
		"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
		"checksum textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0b59b6b4b44d867f1370ef1bd91bfb262bf07bf0ae65c202ea2fbc16153b693"
		"checksum thin-slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85b3e41c2cf31e81a7ec4ad3acd69abde19887e0f7f8e74dcdedc8cb7b158ef8"
		"checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
		"checksum thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf947d192a9be60ef5131cc7a4648886ba89d712f16700ebbf80c8a69d05d48f"
		"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"

layout/style/test/test_selectors.html

+0 −8

Original line number	Diff line number	Diff line
		@@ -303,14 +303,6 @@ function run() {
		// [attr] selector
		test_parseable("[attr]")
		test_parseable_via_api("[attr");
		test_parseable("[ATTR]")
		should_serialize_to("[attr]", "[attr]");
		should_serialize_to("[ATTR]", "[ATTR]");

		// Whether we should drop the bar is debatable. This matches Edge
		// and Safari at the time of writing.
		should_serialize_to("[\|attr]", "[attr]");
		should_serialize_to("[\|ATTR]", "[ATTR]");

		// [attr= ] selector
		test_parseable("[attr=\"x\"]");

servo/components/malloc_size_of/Cargo.toml

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ servo_arc = { path = "../servo_arc" }
		smallbitvec = "2.1.0"
		smallvec = "0.6"
		string_cache = { version = "0.7", optional = true }
		thin-slice = "0.1.0"
		time = { version = "0.1.17", optional = true }
		url = { version = "1.2", optional = true }
		webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }

servo/components/malloc_size_of/lib.rs

+1 −20

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ extern crate smallbitvec;
		extern crate smallvec;
		#[cfg(feature = "servo")]
		extern crate string_cache;
		extern crate thin_slice;
		#[cfg(feature = "servo")]
		extern crate time;
		#[cfg(feature = "url")]
		@@ -232,24 +231,6 @@ impl<T: MallocSizeOf + ?Sized> MallocSizeOf for Box<T> {
		}
		}

		impl<T> MallocShallowSizeOf for thin_slice::ThinBoxedSlice<T> {
		fn shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
		let mut n = 0;
		unsafe {
		n += thin_slice::ThinBoxedSlice::spilled_storage(self)
		.map_or(0, \|ptr\| ops.malloc_size_of(ptr));
		n += ops.malloc_size_of(&**self);
		}
		n
		}
		}

		impl<T: MallocSizeOf> MallocSizeOf for thin_slice::ThinBoxedSlice<T> {
		fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
		self.shallow_size_of(ops) + (**self).size_of(ops)
		}
		}

		impl MallocSizeOf for () {
		fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
		0
		@@ -789,7 +770,7 @@ where
		}

		impl<Impl: selectors::parser::SelectorImpl> MallocSizeOf
		for selectors::attr::AttrSelectorWithOptionalNamespace<Impl>
		for selectors::attr::AttrSelectorWithNamespace<Impl>
		{
		fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
		0

servo/components/selectors/Cargo.toml

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ phf = "0.7.18"
		precomputed-hash = "0.1"
		servo_arc = { version = "0.1", path = "../servo_arc" }
		smallvec = "0.6"
		thin-slice = "0.1.0"

		[build-dependencies]
		phf_codegen = "0.7.18"