follow masque interface
This commit is contained in:
parent
22040d9432
commit
d3bf15f47a
1 changed files with 54 additions and 54 deletions
|
|
@ -946,7 +946,7 @@ pub trait Element {
|
|||
/// Read from a stream to construct this object.
|
||||
/// Consumes up to (and including) the ENDEL record.
|
||||
///
|
||||
fn read(input: &[u8]) -> IResult<Self> where Self: Sized;
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> where Self: Sized;
|
||||
|
||||
///
|
||||
/// Write this element to a stream.
|
||||
|
|
@ -993,7 +993,7 @@ pub struct Reference {
|
|||
}
|
||||
|
||||
impl Element for Reference {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let mut invert_y = false;
|
||||
let mut mag = 1.0;
|
||||
let mut angle_deg = 0.0;
|
||||
|
|
@ -1094,7 +1094,7 @@ pub struct Boundary {
|
|||
}
|
||||
|
||||
impl Element for Boundary {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let (input, layer) = LAYER::skip_and_read(input)?;
|
||||
let (input, dtype) = DATATYPE::read(input)?;
|
||||
let (input, xy) = XY::read(input)?;
|
||||
|
|
@ -1142,7 +1142,7 @@ pub struct Path {
|
|||
}
|
||||
|
||||
impl Element for Path {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let mut path_type = 0;
|
||||
let mut width = 0;
|
||||
let mut bgn_ext = 0;
|
||||
|
|
@ -1221,7 +1221,7 @@ pub struct GDSBox {
|
|||
}
|
||||
|
||||
impl Element for GDSBox {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let (input, layer) = LAYER::skip_and_read(input)?;
|
||||
let (input, dtype) = BOXTYPE::read(input)?;
|
||||
let (input, xy) = XY::read(input)?;
|
||||
|
|
@ -1260,7 +1260,7 @@ pub struct Node {
|
|||
}
|
||||
|
||||
impl Element for Node {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let (input, layer) = LAYER::skip_and_read(input)?;
|
||||
let (input, dtype) = NODETYPE::read(input)?;
|
||||
let (input, xy) = XY::read(input)?;
|
||||
|
|
@ -1317,7 +1317,7 @@ pub struct Text {
|
|||
}
|
||||
|
||||
impl Element for Text {
|
||||
fn read(input: &[u8]) -> IResult<Self> {
|
||||
fn read(input: &[u8]) -> IResult<'_, Self> {
|
||||
let mut path_type = 0;
|
||||
let mut presentation = [false; 16];
|
||||
let mut invert_y = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue