summaryrefslogtreecommitdiff
path: root/www/waterfox/files/patch-servo18126
diff options
context:
space:
mode:
Diffstat (limited to 'www/waterfox/files/patch-servo18126')
-rw-r--r--www/waterfox/files/patch-servo18126232
1 files changed, 0 insertions, 232 deletions
diff --git a/www/waterfox/files/patch-servo18126 b/www/waterfox/files/patch-servo18126
deleted file mode 100644
index ec5e77ad94e0..000000000000
--- a/www/waterfox/files/patch-servo18126
+++ /dev/null
@@ -1,232 +0,0 @@
-commit f0acf27d189d
-Author: Simon Sapin <simon.sapin@exyr.org>
-Date: Thu Aug 17 11:05:32 2017 -0500
-
- servo: Merge #18126 - geckolib: Fix some warnings (treated as error) new in Rust Nigthly (from servo:glow-fox); r=emilio
-
- Source-Repo: https://github.com/servo/servo
- Source-Revision: cc86ca2bcdec5e89ee5279085ea38db63ef41af9
-
- --HG--
- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
- extra : subtree_revision : 0586dbc81f1411c89821605a6dae4ebd0af8f0d5
----
- servo/components/style/gecko/conversions.rs | 2 +-
- servo/components/style/gecko/wrapper.rs | 2 +-
- .../style/gecko_bindings/sugar/ns_t_array.rs | 4 ++--
- servo/components/style/properties/gecko.mako.rs | 18 +++++++++---------
- servo/components/style/style_adjuster.rs | 4 ++--
- servo/ports/geckolib/glue.rs | 12 ++++++------
- 6 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git servo/components/style/gecko/conversions.rs servo/components/style/gecko/conversions.rs
-index 8f3fb6bf2d0f..51015997c5c1 100644
---- servo/components/style/gecko/conversions.rs
-+++ servo/components/style/gecko/conversions.rs
-@@ -348,7 +348,7 @@ impl nsStyleImage {
- // NB: stops are guaranteed to be none in the gecko side by
- // default.
-
-- let mut gecko_stop = unsafe {
-+ let gecko_stop = unsafe {
- &mut (*gecko_gradient).mStops[index]
- };
- let mut coord = nsStyleCoord::null();
-diff --git servo/components/style/gecko/wrapper.rs servo/components/style/gecko/wrapper.rs
-index 034dd94590e2..c402ddaf15bd 100644
---- servo/components/style/gecko/wrapper.rs
-+++ servo/components/style/gecko/wrapper.rs
-@@ -424,7 +424,7 @@ impl<'lb> GeckoXBLBinding<'lb> {
- }
- }
-
-- fn each_xbl_stylist<F>(self, mut f: &mut F)
-+ fn each_xbl_stylist<F>(self, f: &mut F)
- where
- F: FnMut(&Stylist),
- {
-diff --git servo/components/style/gecko_bindings/sugar/ns_t_array.rs servo/components/style/gecko_bindings/sugar/ns_t_array.rs
-index 6bc389702f54..068e10ddea1b 100644
---- servo/components/style/gecko_bindings/sugar/ns_t_array.rs
-+++ servo/components/style/gecko_bindings/sugar/ns_t_array.rs
-@@ -90,7 +90,7 @@ impl<T> nsTArray<T> {
- // this can leak
- debug_assert!(len >= self.len() as u32);
- self.ensure_capacity(len as usize);
-- let mut header = self.header_mut();
-+ let header = self.header_mut();
- header.mLength = len;
- }
-
-@@ -99,7 +99,7 @@ impl<T> nsTArray<T> {
- /// This will not leak since it only works on POD types (and thus doesn't assert)
- pub unsafe fn set_len_pod(&mut self, len: u32) where T: Copy {
- self.ensure_capacity(len as usize);
-- let mut header = unsafe { self.header_mut() };
-+ let header = unsafe { self.header_mut() };
- header.mLength = len;
- }
- }
-diff --git servo/components/style/properties/gecko.mako.rs servo/components/style/properties/gecko.mako.rs
-index 9a2ab2135fc5..bc41ef139af5 100644
---- servo/components/style/properties/gecko.mako.rs
-+++ servo/components/style/properties/gecko.mako.rs
-@@ -4136,14 +4136,14 @@ fn static_assert() {
- fn init_shadow(filter: &mut nsStyleFilter) -> &mut nsCSSShadowArray {
- unsafe {
- let ref mut union = filter.__bindgen_anon_1;
-- let mut shadow_array: &mut *mut nsCSSShadowArray = union.mDropShadow.as_mut();
-+ let shadow_array: &mut *mut nsCSSShadowArray = union.mDropShadow.as_mut();
- *shadow_array = Gecko_NewCSSShadowArray(1);
-
- &mut **shadow_array
- }
- }
-
-- let mut gecko_shadow = init_shadow(gecko_filter);
-+ let gecko_shadow = init_shadow(gecko_filter);
- gecko_shadow.mArray[0].set_from_simple_shadow(shadow);
- },
- Url(ref url) => {
-@@ -4665,14 +4665,14 @@ fn static_assert() {
- unsafe {
- // We have to be very careful to avoid a copy here!
- let ref mut union = ${ident}.__bindgen_anon_1;
-- let mut shape: &mut *mut StyleBasicShape = union.mBasicShape.as_mut();
-+ let shape: &mut *mut StyleBasicShape = union.mBasicShape.as_mut();
- *shape = Gecko_NewBasicShape(ty);
- &mut **shape
- }
- }
- match servo_shape {
- BasicShape::Inset(inset) => {
-- let mut shape = init_shape(${ident}, StyleBasicShapeType::Inset);
-+ let shape = init_shape(${ident}, StyleBasicShapeType::Inset);
- unsafe { shape.mCoordinates.set_len(4) };
-
- // set_len() can't call constructors, so the coordinates
-@@ -4694,7 +4694,7 @@ fn static_assert() {
- set_corners_from_radius(inset.round, &mut shape.mRadius);
- }
- BasicShape::Circle(circ) => {
-- let mut shape = init_shape(${ident}, StyleBasicShapeType::Circle);
-+ let shape = init_shape(${ident}, StyleBasicShapeType::Circle);
- unsafe { shape.mCoordinates.set_len(1) };
- shape.mCoordinates[0].leaky_set_null();
- circ.radius.to_gecko_style_coord(&mut shape.mCoordinates[0]);
-@@ -4702,7 +4702,7 @@ fn static_assert() {
- shape.mPosition = circ.position.into();
- }
- BasicShape::Ellipse(el) => {
-- let mut shape = init_shape(${ident}, StyleBasicShapeType::Ellipse);
-+ let shape = init_shape(${ident}, StyleBasicShapeType::Ellipse);
- unsafe { shape.mCoordinates.set_len(2) };
- shape.mCoordinates[0].leaky_set_null();
- el.semiaxis_x.to_gecko_style_coord(&mut shape.mCoordinates[0]);
-@@ -4712,7 +4712,7 @@ fn static_assert() {
- shape.mPosition = el.position.into();
- }
- BasicShape::Polygon(poly) => {
-- let mut shape = init_shape(${ident}, StyleBasicShapeType::Polygon);
-+ let shape = init_shape(${ident}, StyleBasicShapeType::Polygon);
- unsafe {
- shape.mCoordinates.set_len(poly.coordinates.len() as u32 * 2);
- }
-@@ -4797,7 +4797,7 @@ clip-path
- bindings::Gecko_nsStyleSVG_SetDashArrayLength(&mut self.gecko, v.len() as u32);
- }
-
-- for (mut gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v) {
-+ for (gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v) {
- match servo {
- Either::First(number) => gecko.set_value(CoordDataValue::Factor(number)),
- Either::Second(lop) => gecko.set(lop),
-@@ -4885,7 +4885,7 @@ clip-path
- }
-
- self.gecko.mContextPropsBits = 0;
-- for (mut gecko, servo) in self.gecko.mContextProps.iter_mut().zip(v) {
-+ for (gecko, servo) in self.gecko.mContextProps.iter_mut().zip(v) {
- if servo.0 == atom!("fill") {
- self.gecko.mContextPropsBits |= structs::NS_STYLE_CONTEXT_PROPERTY_FILL as u8;
- } else if servo.0 == atom!("stroke") {
-diff --git servo/components/style/style_adjuster.rs servo/components/style/style_adjuster.rs
-index 03b15916b237..366641ebe0bc 100644
---- servo/components/style/style_adjuster.rs
-+++ servo/components/style/style_adjuster.rs
-@@ -167,7 +167,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
- // When 'contain: paint', update overflow from 'visible' to 'clip'.
- if self.style.get_box().clone_contain().contains(contain::PAINT) {
- if self.style.get_box().clone_overflow_x() == overflow::visible {
-- let mut box_style = self.style.mutate_box();
-+ let box_style = self.style.mutate_box();
- box_style.set_overflow_x(overflow::_moz_hidden_unscrollable);
- box_style.set_overflow_y(overflow::_moz_hidden_unscrollable);
- }
-@@ -182,7 +182,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
- use properties::longhands::font_style::computed_value::T as font_style;
- use properties::longhands::font_weight::computed_value::T as font_weight;
- if self.style.get_font().clone__moz_math_variant() != moz_math_variant::none {
-- let mut font_style = self.style.mutate_font();
-+ let font_style = self.style.mutate_font();
- // Sadly we don't have a nice name for the computed value
- // of "font-weight: normal".
- font_style.set_font_weight(font_weight::normal());
-diff --git servo/ports/geckolib/glue.rs servo/ports/geckolib/glue.rs
-index 977728286fc3..fa09bee29553 100644
---- servo/ports/geckolib/glue.rs
-+++ servo/ports/geckolib/glue.rs
-@@ -815,7 +815,7 @@ pub extern "C" fn Servo_StyleSet_AppendStyleSheet(
- ) {
- let global_style_data = &*GLOBAL_STYLE_DATA;
- let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-- let mut data = &mut *data;
-+ let data = &mut *data;
- let guard = global_style_data.shared_lock.read();
- data.stylesheets.append_stylesheet(
- &data.stylist,
-@@ -867,7 +867,7 @@ pub extern "C" fn Servo_StyleSet_PrependStyleSheet(
- ) {
- let global_style_data = &*GLOBAL_STYLE_DATA;
- let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-- let mut data = &mut *data;
-+ let data = &mut *data;
- let guard = global_style_data.shared_lock.read();
- data.stylesheets.prepend_stylesheet(
- &data.stylist,
-@@ -885,7 +885,7 @@ pub extern "C" fn Servo_StyleSet_InsertStyleSheetBefore(
- ) {
- let global_style_data = &*GLOBAL_STYLE_DATA;
- let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-- let mut data = &mut *data;
-+ let data = &mut *data;
- let guard = global_style_data.shared_lock.read();
- data.stylesheets.insert_stylesheet_before(
- &data.stylist,
-@@ -903,7 +903,7 @@ pub extern "C" fn Servo_StyleSet_RemoveStyleSheet(
- ) {
- let global_style_data = &*GLOBAL_STYLE_DATA;
- let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
-- let mut data = &mut *data;
-+ let data = &mut *data;
- let guard = global_style_data.shared_lock.read();
- data.stylesheets.remove_stylesheet(
- &data.stylist,
-@@ -1274,7 +1274,7 @@ pub extern "C" fn Servo_StyleRule_GetSpecificityAtIndex(
- specificity: *mut u64
- ) {
- read_locked_arc(rule, |rule: &StyleRule| {
-- let mut specificity = unsafe { specificity.as_mut().unwrap() };
-+ let specificity = unsafe { specificity.as_mut().unwrap() };
- let index = index as usize;
- if index >= rule.selectors.0.len() {
- *specificity = 0;
-@@ -2775,7 +2775,7 @@ pub extern "C" fn Servo_NoteExplicitHints(element: RawGeckoElementBorrowed,
- pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed,
- was_restyled: *mut bool) -> nsChangeHint
- {
-- let mut was_restyled = unsafe { was_restyled.as_mut().unwrap() };
-+ let was_restyled = unsafe { was_restyled.as_mut().unwrap() };
- let element = GeckoElement(element);
-
- let damage = match element.mutate_data() {