Skip to content

Commit

Permalink
Merge branch 'servo:main' into clippywarnings
Browse files Browse the repository at this point in the history
  • Loading branch information
richarddushime committed Mar 19, 2024
2 parents 45efe83 + 8cf47e6 commit 2684c52
Show file tree
Hide file tree
Showing 185 changed files with 105,349 additions and 37,336 deletions.
82 changes: 41 additions & 41 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -97,7 +97,7 @@ servo-media-gstreamer = { git = "https://github.com/servo/media" }
servo_arc = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
servo_atoms = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
size_of_test = { git = "https://github.com/servo/stylo.git", branch = "2023-09-01" }
smallbitvec = "2.5.2"
smallbitvec = "2.5.3"
smallvec = "1.13"
sparkle = "0.1.26"
string_cache = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion components/layout_2020/table/construct.rs
Expand Up @@ -477,7 +477,7 @@ impl TableBuilder {

/// When not in the process of filling a cell, make sure any incoming rowspans are
/// filled so that the next specified cell comes after them. Should have been called before
/// [`Self::handle_cell`].
/// [`Self::add_cell`]
///
/// if `stop_at_cell_opportunity` is set, this will stop at the first slot with
/// `incoming_rowspans` equal to zero. If not, it will insert [`TableSlot::Empty`] and
Expand Down
6 changes: 3 additions & 3 deletions components/layout_2020/table/mod.rs
Expand Up @@ -92,14 +92,14 @@ pub struct Table {
/// The column groups for this table.
pub column_groups: Vec<TableTrackGroup>,

/// The columns of this tabled defined by `<colgroup> | display: table-column-group`
/// The columns of this table defined by `<colgroup> | display: table-column-group`
/// and `<col> | display: table-column` elements as well as `display: table-column`.
pub columns: Vec<TableTrack>,

/// The rows groups for this table deinfed by `<tbody>`, `<thead>`, and `<tfoot>`.
/// The rows groups for this table defined by `<tbody>`, `<thead>`, and `<tfoot>`.
pub row_groups: Vec<TableTrackGroup>,

/// The rows of this tabled defined by `<tr>` or `display: table-row` elements.
/// The rows of this table defined by `<tr>` or `display: table-row` elements.
pub rows: Vec<TableTrack>,

/// The content of the slots of this table.
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/bindings/codegen/Bindings.conf
Expand Up @@ -161,7 +161,7 @@ DOMInterfaces = {
},

'GPUDevice': {
'inRealms': ['PopErrorScope', 'GetLost'],
'inRealms': ['PopErrorScope', 'GetLost', 'CreateComputePipelineAsync', 'CreateRenderPipelineAsync'],
}

}

0 comments on commit 2684c52

Please sign in to comment.