From 0c982dcd1660efe09431ed5f39d87f7b6c4188ea Mon Sep 17 00:00:00 2001 From: Mats Palmgren Date: Mon, 6 May 2019 02:43:50 +0200 Subject: [PATCH] style: [css-grid-2] Remove single keyword 'subgrid' as a valid value for the 'grid' and 'grid-template' shorthands. Differential Revision: https://phabricator.services.mozilla.com/D29974 --- components/style/properties/shorthands/position.mako.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/style/properties/shorthands/position.mako.rs b/components/style/properties/shorthands/position.mako.rs index aaf97a0674c..6fdbe1235cf 100644 --- a/components/style/properties/shorthands/position.mako.rs +++ b/components/style/properties/shorthands/position.mako.rs @@ -254,7 +254,7 @@ use crate::parser::Parse; use servo_arc::Arc; use crate::values::{Either, None_}; - use crate::values::generics::grid::{LineNameList, TrackSize, TrackList, TrackListType}; + use crate::values::generics::grid::{TrackSize, TrackList, TrackListType}; use crate::values::generics::grid::{TrackListValue, concat_serialize_idents}; use crate::values::specified::{GridTemplateComponent, GenericGridTemplateComponent}; use crate::values::specified::grid::parse_line_names; @@ -265,12 +265,11 @@ context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result<(GridTemplateComponent, GridTemplateComponent, Either), ParseError<'i>> { - // Other shorthand sub properties also parse `none` and `subgrid` keywords and this - // shorthand should know after these keywords there is nothing to parse. Otherwise it - // gets confused and rejects the sub properties that contains `none` or `subgrid`. + // Other shorthand sub properties also parse the `none` keyword and this shorthand + // should know after this keyword there is nothing to parse. Otherwise it gets + // confused and rejects the sub properties that contains `none`. <% keywords = { "none": "GenericGridTemplateComponent::None", - "subgrid": "GenericGridTemplateComponent::Subgrid(LineNameList::default())" } %> % for keyword, rust_type in keywords.items():