Update nightly rustc.

jdm · jdm · commit 01681e79c47e · 2021-11-01T08:46:18.000-04:00
diff --git a/components/constellation/network_listener.rs b/components/constellation/network_listener.rs
@@ -143,7 +143,7 @@ impl NetworkListener {
                         //
                         // Ideally the Fetch code would handle manual redirects on its own
                         self.initiate_fetch(None);
-                    }
+                    },
                     _ => {
                         // Response should be processed by script thread.
                         self.should_send = true;
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
@@ -1787,7 +1787,7 @@ impl Fragment {
                         clip,
                     );
                 }
-            }
+            },
             SpecificFragmentInfo::ScannedText(ref text_fragment) => {
                 // Create the main text display item.
                 self.build_display_list_for_text_fragment(
diff --git a/components/layout/floats.rs b/components/layout/floats.rs
@@ -217,7 +217,7 @@ impl Floats {
                          max_inline_start is {:?}",
                         max_inline_start
                     );
-                }
+                },
                 FloatKind::Right
                     if float_pos.i < min_inline_end &&
                         float_pos.b + float_size.block > block_start &&
@@ -232,7 +232,7 @@ impl Floats {
                          is {:?}",
                         min_inline_end
                     );
-                }
+                },
                 FloatKind::Left | FloatKind::Right => {},
             }
         }
diff --git a/components/layout/query.rs b/components/layout/query.rs
@@ -1037,7 +1037,7 @@ fn process_resolved_style_request_internal<'dom>(
                 .result
                 .map(|r| r.to_css_string())
                 .unwrap_or(String::new())
-        }
+        },
 
         LonghandId::Bottom | LonghandId::Top | LonghandId::Right | LonghandId::Left
             if applies && positioned && style.get_box().display != Display::None =>
diff --git a/components/layout_2020/query.rs b/components/layout_2020/query.rs
@@ -547,7 +547,7 @@ fn process_offset_parent_query_inner(
                                 Au::from_f32_px(padding_box_corner.y.px()),
                             );
                             Some(padding_box_corner)
-                        }
+                        },
                         Fragment::AbsoluteOrFixedPositioned(_) |
                         Fragment::Box(_) |
                         Fragment::Text(_) |
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
@@ -347,7 +347,7 @@ pub fn main_fetch(
                         .iter()
                         .map(|(name, _)| name.as_str().to_owned())
                         .collect();
-                }
+                },
                 // Subsubstep 3.
                 Some(list) => {
                     response.cors_exposed_header_name_list =
diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
@@ -427,7 +427,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
                 if url.host().is_none() || url.cannot_be_a_base() || url.scheme() == "file" =>
             {
                 return;
-            }
+            },
             None => return,
             // Step 4.
             Some(url) => {
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
@@ -695,13 +695,13 @@ impl HTMLInputElement {
                 {
                     let intervals_from_base = ((value - step_base) / allowed_value_step).floor();
                     intervals_from_base * allowed_value_step + step_base
-                }
+                },
                 StepDirection::Up =>
                 // step up a fractional step to be on a step multiple
                 {
                     let intervals_from_base = ((value - step_base) / allowed_value_step).ceil();
                     intervals_from_base * allowed_value_step + step_base
-                }
+                },
             };
         } else {
             value = value +
@@ -2371,7 +2371,7 @@ impl VirtualMethods for HTMLInputElement {
                             {
                                 self.SetValue(DOMString::from(""))
                                     .expect("Failed to set input value on type change to ValueMode::Filename.");
-                            }
+                            },
                             _ => {},
                         }
 
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
@@ -209,7 +209,7 @@ impl VideoFrameRenderer for MediaFrameRenderer {
                 if let Some(old_image_key) = self.old_frame.take() {
                     updates.push(ImageUpdate::DeleteImage(old_image_key));
                 }
-            }
+            },
             Some((ref mut image_key, ref mut width, ref mut height)) => {
                 self.old_frame = Some(*image_key);
 
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
@@ -2893,13 +2893,13 @@ impl NodeMethods for Node {
                     if !is_equal_processinginstruction(this, node) =>
                 {
                     return false;
-                }
+                },
                 NodeTypeId::CharacterData(CharacterDataTypeId::Text(_)) |
                 NodeTypeId::CharacterData(CharacterDataTypeId::Comment)
                     if !is_equal_characterdata(this, node) =>
                 {
                     return false;
-                }
+                },
                 // Step 4.
                 NodeTypeId::Element(..) if !is_equal_element_attrs(this, node) => return false,
                 NodeTypeId::Attr if !is_equal_attr(this, node) => return false,
diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs
@@ -187,7 +187,7 @@ impl TreeWalkerMethods for TreeWalker {
                 // outside of the tree rooted at the original root.
                 {
                     return Ok(None);
-                }
+                },
                 Some(n) => node = n,
             }
             // "5. Filter node and if the return value is FILTER_ACCEPT, then
@@ -319,7 +319,7 @@ impl TreeWalker {
                                 if self.is_root_node(&parent) || self.is_current_node(&parent) =>
                             {
                                 return Ok(None);
-                            }
+                            },
                             // "5. Otherwise, set node to parent."
                             Some(parent) => node = parent,
                         }
@@ -467,7 +467,7 @@ impl<'a> Iterator for &'a TreeWalker {
             // which cannot produce an Err result.
             {
                 unreachable!()
-            }
+            },
         }
     }
 }
diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs
@@ -92,7 +92,7 @@ impl URL {
                         return Err(Error::Type(format!("could not parse base: {}", error)));
                     },
                 }
-            }
+            },
         };
         // Step 3.
         let parsed_url = match ServoUrl::parse_with_base(parsed_base.as_ref(), &url.0) {
diff --git a/components/script/dom/webgl_validations/tex_image_2d.rs b/components/script/dom/webgl_validations/tex_image_2d.rs
@@ -356,7 +356,7 @@ impl<'a> WebGLValidator for TexImage2DValidator<'a> {
             {
                 context.webgl_error(InvalidOperation);
                 return Err(TexImageValidationError::InvalidTypeForFormat);
-            }
+            },
             TexDataType::UnsignedShort565 if format != TexFormat::RGB => {
                 context.webgl_error(InvalidOperation);
                 return Err(TexImageValidationError::InvalidTypeForFormat);
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
@@ -1412,7 +1412,7 @@ impl XMLHttpRequest {
                 if has_no_child_nodes {
                     return None;
                 }
-            }
+            },
             // Step 3
             _ => {
                 return None;
diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
@@ -92,9 +92,14 @@ fn has_lint_attr(sym: &Symbols, attrs: &[Attribute], name: Symbol) -> bool {
 }
 
 /// Checks if a type is unrooted or contains any owned unrooted types
-fn is_unrooted_ty(sym: &Symbols, cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool {
+fn is_unrooted_ty<'tcx>(
+    sym: &'_ Symbols,
+    cx: &LateContext<'tcx>,
+    ty: &'tcx ty::TyS<'tcx>,
+    in_new_function: bool,
+) -> bool {
     let mut ret = false;
-    let mut walker = ty.walk();
+    let mut walker = ty.walk(cx.tcx);
     while let Some(generic_arg) = walker.next() {
         let t = match generic_arg.unpack() {
             rustc_middle::ty::subst::GenericArgKind::Type(t) => t,
diff --git a/components/style/counter_style/mod.rs b/components/style/counter_style/mod.rs
@@ -108,15 +108,15 @@ pub fn parse_counter_style_body<'i, 't>(
             Some(ContextualParseError::InvalidCounterStyleWithoutSymbols(
                 system,
             ))
-        }
+        },
         ref system @ System::Alphabetic | ref system @ System::Numeric
             if rule.symbols().unwrap().0.len() < 2 =>
         {
             let system = system.to_css_string();
             Some(ContextualParseError::InvalidCounterStyleNotEnoughSymbols(
                 system,
             ))
-        }
+        },
         System::Additive if rule.additive_symbols.is_none() => {
             Some(ContextualParseError::InvalidCounterStyleWithoutAdditiveSymbols)
         },
diff --git a/components/style/custom_properties.rs b/components/style/custom_properties.rs
@@ -1016,7 +1016,7 @@ fn substitute_block<'i>(
                     Ok(())
                 })?;
                 set_position_at_next_iteration = true
-            }
+            },
             Token::Function(_) |
             Token::ParenthesisBlock |
             Token::CurlyBracketBlock |
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
@@ -1009,7 +1009,7 @@ impl LengthPercentage {
                 return Ok(LengthPercentage::Percentage(computed::Percentage(
                     unit_value,
                 )));
-            }
+            },
             Token::Number { value, .. } if num_context.is_ok(context.parsing_mode, value) => {
                 if value != 0. &&
                     !context.parsing_mode.allows_unitless_lengths() &&
diff --git a/ports/libmlservo/src/lib.rs b/ports/libmlservo/src/lib.rs
@@ -249,7 +249,7 @@ pub unsafe extern "C" fn move_servo(servo: *mut ServoInstance, x: f32, y: f32) {
                 if (start - point).square_length() < DRAG_CUTOFF_SQUARED =>
             {
                 return;
-            }
+            },
             ScrollState::TriggerDown(start) => {
                 servo.scroll_state = ScrollState::TriggerDragging(start, point);
                 let _ = call(|s| s.mouse_move(x, y));
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2021-08-13
+nightly-2021-10-31

Original file line number	Diff line number	Diff line change
`@@ -1787,7 +1787,7 @@ impl Fragment {`
`1787`	`1787`	`clip,`
`1788`	`1788`	`);`
`1789`	`1789`	`}`
`1790`		`- }`
	`1790`	`+ },`
`1791`	`1791`	`SpecificFragmentInfo::ScannedText(ref text_fragment) => {`
`1792`	`1792`	`// Create the main text display item.`
`1793`	`1793`	`self.build_display_list_for_text_fragment(`
Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {`
`427`	`427`	`if url.host().is_none() \|\| url.cannot_be_a_base() \|\| url.scheme() == "file" =>`
`428`	`428`	`{`
`429`	`429`	`return;`
`430`		`- }`
	`430`	`+ },`
`431`	`431`	`None => return,`
`432`	`432`	`// Step 4.`
`433`	`433`	`Some(url) => {`
Original file line number	Diff line number	Diff line change
`@@ -695,13 +695,13 @@ impl HTMLInputElement {`
`695`	`695`	`{`
`696`	`696`	`let intervals_from_base = ((value - step_base) / allowed_value_step).floor();`
`697`	`697`	`intervals_from_base * allowed_value_step + step_base`
`698`		`- }`
	`698`	`+ },`
`699`	`699`	`StepDirection::Up =>`
`700`	`700`	`// step up a fractional step to be on a step multiple`
`701`	`701`	`{`
`702`	`702`	`let intervals_from_base = ((value - step_base) / allowed_value_step).ceil();`
`703`	`703`	`intervals_from_base * allowed_value_step + step_base`
`704`		`- }`
	`704`	`+ },`
`705`	`705`	`};`
`706`	`706`	`} else {`
`707`	`707`	`value = value +`
`@@ -2371,7 +2371,7 @@ impl VirtualMethods for HTMLInputElement {`
`2371`	`2371`	`{`
`2372`	`2372`	`self.SetValue(DOMString::from(""))`
`2373`	`2373`	`.expect("Failed to set input value on type change to ValueMode::Filename.");`
`2374`		`- }`
	`2374`	`+ },`
`2375`	`2375`	`_ => {},`
`2376`	`2376`	`}`
`2377`	`2377`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ impl VideoFrameRenderer for MediaFrameRenderer {`
`209`	`209`	`if let Some(old_image_key) = self.old_frame.take() {`
`210`	`210`	`updates.push(ImageUpdate::DeleteImage(old_image_key));`
`211`	`211`	`}`
`212`		`- }`
	`212`	`+ },`
`213`	`213`	`Some((ref mut image_key, ref mut width, ref mut height)) => {`
`214`	`214`	`self.old_frame = Some(*image_key);`
`215`	`215`