Bump Rust in CI and fix clippy lints (#49)

Author: laurmaedje

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.77.0
+      - uses: dtolnay/rust-toolchain@1.83.0
       - uses: Swatinem/rust-cache@v2
       - run: cargo test --no-run
       - run: cargo test --no-fail-fast
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.77.0
+      - uses: dtolnay/rust-toolchain@1.83.0
         with:
           components: clippy, rustfmt
       - uses: Swatinem/rust-cache@v2

src/actions.rs

@@ -14,7 +14,7 @@ writer!(Action: |obj| {
     Self { dict }
 });
 
-impl<'a> Action<'a> {
+impl Action<'_> {
     /// Write the `/S` attribute to set the action type.
     pub fn action_type(&mut self, kind: ActionType) -> &mut Self {
         self.pair(Name(b"S"), kind.to_name());
@@ -147,7 +147,7 @@ pub struct Fields<'a> {
 
 writer!(Fields: |obj| Self { array: obj.array() });
 
-impl<'a> Fields<'a> {
+impl Fields<'_> {
     /// The indirect reference to the field.
     pub fn id(&mut self, id: Ref) -> &mut Self {
         self.array.item(id);
@@ -299,7 +299,7 @@ pub struct AdditionalActions<'a> {
 writer!(AdditionalActions: |obj| Self { dict: obj.dict() });
 
 /// Only permissible for [annotations](Annotation).
-impl<'a> AdditionalActions<'a> {
+impl AdditionalActions<'_> {
     /// Start writing the `/E` dictionary. An action that shall be performed
     /// when the cursor enters the annotation's active area. Only permissible
     /// for annotations. PDF 1.2+.
@@ -360,7 +360,7 @@ impl<'a> AdditionalActions<'a> {
 
 /// Only permissible for [widget](crate::types::AnnotationType::Widget)
 /// [annotations](Annotation).
-impl<'a> AdditionalActions<'a> {
+impl AdditionalActions<'_> {
     /// Start writing the `/Fo` dictionary. This sets the action that shall be
     /// performed when the annotation receives the input focus. Only permissible
     /// for widget annotations. PDF 1.2+.
@@ -377,7 +377,7 @@ impl<'a> AdditionalActions<'a> {
 }
 
 /// Only permissible for [page objects](Page).
-impl<'a> AdditionalActions<'a> {
+impl AdditionalActions<'_> {
     /// Start writing the `/O` dictionary. This sets the action that shall be
     /// performed when the page is opened. This action is independent of any
     /// that may be defined by the open action entry in the
@@ -397,7 +397,7 @@ impl<'a> AdditionalActions<'a> {
 }
 
 /// Only permisible for form fields.
-impl<'a> AdditionalActions<'a> {
+impl AdditionalActions<'_> {
     /// Start writing the `/K` dictionary. This sets the JavaScript action that
     /// shall be performed when the user modifies a character in a text field
     /// or combo box or modifies the selection in a scrollable list box. This
@@ -434,7 +434,7 @@ impl<'a> AdditionalActions<'a> {
 }
 
 /// Only permisible for [document catalog](Catalog).
-impl<'a> AdditionalActions<'a> {
+impl AdditionalActions<'_> {
     /// Start writing the `/WC` dictionary. This sets the JavaScript action
     /// that shall be performed before closing a document. Only permissible for
     /// the [document catalog](Catalog) PDF 1.4+.

src/annotations.rs

@@ -13,7 +13,7 @@ writer!(Annotation: |obj| {
     Self { dict }
 });
 
-impl<'a> Annotation<'a> {
+impl Annotation<'_> {
     /// Write the `/Subtype` attribute to tell the viewer the type of this
     /// particular annotation.
     pub fn subtype(&mut self, kind: AnnotationType) -> &mut Self {
@@ -396,7 +396,7 @@ pub struct AppearanceCharacteristics<'a> {
 
 writer!(AppearanceCharacteristics: |obj| Self { dict: obj.dict() });
 
-impl<'a> AppearanceCharacteristics<'a> {
+impl AppearanceCharacteristics<'_> {
     /// Write the `/R` attribute. This is the number of degrees the widget
     /// annotation should be rotated by counterclockwise relative to its page
     /// when displayed. This should be a multiple of 90.
@@ -552,7 +552,7 @@ pub struct IconFit<'a> {
 
 writer!(IconFit: |obj| Self { dict: obj.dict() });
 
-impl<'a> IconFit<'a> {
+impl IconFit<'_> {
     /// Write the `/SW` attribute. This sets under which circumstances the icon
     /// of the widget annotation should be scaled.
     pub fn scale(&mut self, value: IconScale) -> &mut Self {
@@ -668,7 +668,7 @@ pub struct Appearance<'a> {
 
 writer!(Appearance: |obj| Self { dict: obj.dict() });
 
-impl<'a> Appearance<'a> {
+impl Appearance<'_> {
     /// Start writing the `/N` stream or dictionary to set the annotation's
     /// normal appearance.
     pub fn normal(&mut self) -> AppearanceEntry<'_> {
@@ -729,7 +729,7 @@ writer!(BorderStyle: |obj| {
     Self { dict }
 });
 
-impl<'a> BorderStyle<'a> {
+impl BorderStyle<'_> {
     /// Write the `/W` attribute. This is the width of the border in points.
     pub fn width(&mut self, points: f32) -> &mut Self {
         self.pair(Name(b"W"), points);

src/attributes.rs

@@ -60,7 +60,7 @@ pub struct UserProperty<'a> {
 
 writer!(UserProperty: |obj| Self { dict: obj.dict() });
 
-impl<'a> UserProperty<'a> {
+impl UserProperty<'_> {
     /// Write the `/N` attribute to set the name of the property.
     pub fn name(&mut self, name: TextStr) -> &mut Self {
         self.dict.pair(Name(b"N"), name);
@@ -400,7 +400,7 @@ impl BlockAlign {
 }
 
 /// Grouping elements.
-impl<'a> LayoutAttributes<'a> {
+impl LayoutAttributes<'_> {
     /// Write the `/ColumnCount` attribute. PDF 1.6+.
     pub fn column_count(&mut self, count: i32) -> &mut Self {
         self.dict.pair(Name(b"ColumnCount"), count);

src/color.rs

@@ -898,7 +898,7 @@ writer!(ShadingPattern: |obj| {
     Self { dict }
 });
 
-impl<'a> ShadingPattern<'a> {
+impl ShadingPattern<'_> {
     /// Start writing the `/Shading` dictionary for a type 1, 2, or 3 shading.
     pub fn function_shading(&mut self) -> FunctionShading<'_> {
         self.dict.insert(Name(b"Shading")).start()
@@ -936,7 +936,7 @@ pub struct FunctionShading<'a> {
 
 writer!(FunctionShading: |obj| Self { dict: obj.dict() });
 
-impl<'a> FunctionShading<'a> {
+impl FunctionShading<'_> {
     /// Write the `/ShadingType` attribute.
     ///
     /// Sets the type of shading. The available and required attributes change

src/content.rs

@@ -1156,7 +1156,7 @@ pub struct Resources<'a> {
 
 writer!(Resources: |obj| Self { dict: obj.dict() });
 
-impl<'a> Resources<'a> {
+impl Resources<'_> {
     /// Start writing the `/XObject` dictionary.
     ///
     /// Relevant types:
@@ -1292,7 +1292,7 @@ writer!(ExtGraphicsState: |obj| {
     Self { dict }
 });
 
-impl<'a> ExtGraphicsState<'a> {
+impl ExtGraphicsState<'_> {
     /// Write the `LW` attribute to set the line width. PDF 1.3+.
     pub fn line_width(&mut self, width: f32) -> &mut Self {
         self.pair(Name(b"LW"), width);
@@ -1586,7 +1586,7 @@ writer!(SoftMask: |obj| {
     Self { dict }
 });
 
-impl<'a> SoftMask<'a> {
+impl SoftMask<'_> {
     /// Write the `S` attribute to set the soft mask subtype. Required.
     pub fn subtype(&mut self, subtype: MaskType) -> &mut Self {
         self.pair(Name(b"S"), subtype.to_name());

src/files.rs

@@ -14,7 +14,7 @@ writer!(FileSpec: |obj| {
     Self { dict }
 });
 
-impl<'a> FileSpec<'a> {
+impl FileSpec<'_> {
     /// Write the `/FS` attribute to set the file system this entry relates to.
     /// If you set the `system` argument to `Name(b"URL")`, this becomes an URL
     /// specification.
@@ -129,7 +129,7 @@ pub struct EmbeddingParams<'a> {
 
 writer!(EmbeddingParams: |obj| Self { dict: obj.dict() });
 
-impl<'a> EmbeddingParams<'a> {
+impl EmbeddingParams<'_> {
     /// Write the `/Size` attribute to set the uncompressed file size in bytes.
     pub fn size(&mut self, size: i32) -> &mut Self {
         self.pair(Name(b"Size"), size);

src/font.rs

@@ -16,7 +16,7 @@ writer!(Type1Font: |obj| {
     Self { dict }
 });
 
-impl<'a> Type1Font<'a> {
+impl Type1Font<'_> {
     /// Write the `/Name` attribute, which is the name of the font in the
     /// current resource dictionary. Required in PDF 1.0, discouraged in PDF
     /// 1.1+.
@@ -103,7 +103,7 @@ writer!(Type3Font: |obj| {
     Self { dict }
 });
 
-impl<'a> Type3Font<'a> {
+impl Type3Font<'_> {
     /// Write the `/Name` attribute, which is the name of the font in the
     /// current resource dictionary. Always required in PDF 1.0, required if
     /// `FontName` is set in child font descriptor.
@@ -209,7 +209,7 @@ writer!(Encoding: |obj| {
     Self { dict }
 });
 
-impl<'a> Encoding<'a> {
+impl Encoding<'_> {
     /// Write the `BaseEncoding` attribute, from which this encoding is
     /// described through differences.
     pub fn base_encoding(&mut self, name: Name) -> &mut Self {
@@ -234,7 +234,7 @@ pub struct Differences<'a> {
 
 writer!(Differences: |obj| Self { array: obj.array() });
 
-impl<'a> Differences<'a> {
+impl Differences<'_> {
     /// Maps consecutive character codes starting at `start` to the given glyph
     /// names.
     pub fn consecutive<'n>(
@@ -266,7 +266,7 @@ writer!(Type0Font: |obj| {
     Self { dict }
 });
 
-impl<'a> Type0Font<'a> {
+impl Type0Font<'_> {
     /// Write the `/BaseFont` attribute. This is the PostScript name of the
     /// font. Required.
     pub fn base_font(&mut self, name: Name) -> &mut Self {
@@ -320,7 +320,7 @@ writer!(CidFont: |obj| {
     Self { dict }
 });
 
-impl<'a> CidFont<'a> {
+impl CidFont<'_> {
     /// Write the `/Subtype` attribute. Required.
     pub fn subtype(&mut self, subtype: CidFontType) -> &mut Self {
         self.pair(Name(b"Subtype"), subtype.to_name());
@@ -405,7 +405,7 @@ pub struct Widths<'a> {
 
 writer!(Widths: |obj| Self { array: obj.array() });
 
-impl<'a> Widths<'a> {
+impl Widths<'_> {
     /// Specifies individual widths for a range of consecutive CIDs starting at
     /// `start`.
     pub fn consecutive(
@@ -442,7 +442,7 @@ writer!(FontDescriptor: |obj| {
     Self { dict }
 });
 
-impl<'a> FontDescriptor<'a> {
+impl FontDescriptor<'_> {
     /// Write the `/FontName` attribute. Required, except for Type 3 fonts.
     pub fn name(&mut self, name: Name) -> &mut Self {
         self.pair(Name(b"FontName"), name);

src/forms.rs

@@ -10,7 +10,7 @@ pub struct Form<'a> {
 
 writer!(Form: |obj| Self { dict: obj.dict() });
 
-impl<'a> Form<'a> {
+impl Form<'_> {
     /// Write the `/Fields` attribute to reference the root [form fields](Field)
     /// (those who have no immediate parent) of this document.
     pub fn fields(&mut self, fields: impl IntoIterator<Item = Ref>) -> &mut Self {
@@ -203,7 +203,7 @@ impl FieldType {
 }
 
 /// Only permissible on button fields.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Write the `/Opt` array to set the export values of children of this
     /// field. Only permissible on checkbox fields, or radio button fields.
     /// PDF 1.4+.
@@ -217,7 +217,7 @@ impl<'a> Field<'a> {
 }
 
 /// Only permissible on check box fields.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Write the `/V` attribute to set the state of this check box field. The
     /// state corresponds to an appearance stream in the [appearance
     /// dictionary](AppearanceCharacteristics) of this field's widget
@@ -255,7 +255,7 @@ impl CheckBoxState {
 }
 
 /// Only permissible on radio button fields.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Write the `/V` attribute to set the state of this radio button field.
     /// The state corresponds to an appearance stream in the
     /// [appearance subdictionary](Appearance) of this field's widget
@@ -278,7 +278,7 @@ impl<'a> Field<'a> {
 }
 
 /// Only permissible on text fields.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Write the `/MaxLen` attribute to set the maximum length of the fields
     /// text in characters. Only permissible on text fields.
     ///
@@ -305,7 +305,7 @@ impl<'a> Field<'a> {
 }
 
 /// Only permissible on fields containing variable text.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Write the `/DA` attribute containing a sequence of valid page-content
     /// graphics or text state operators that define such properties as the
     /// field's text size and colour. Only permissible on fields containing
@@ -350,7 +350,7 @@ pub enum Quadding {
 }
 
 /// Only permissible on choice fields.
-impl<'a> Field<'a> {
+impl Field<'_> {
     /// Start writing the `/Opt` array to set the options that shall be
     /// presented to the user.
     pub fn choice_options(&mut self) -> ChoiceOptions<'_> {
@@ -440,7 +440,7 @@ pub struct ChoiceOptions<'a> {
 
 writer!(ChoiceOptions: |obj| Self { array: obj.array() });
 
-impl<'a> ChoiceOptions<'a> {
+impl ChoiceOptions<'_> {
     /// Add an option with the given value.
     pub fn option(&mut self, value: TextStr) -> &mut Self {
         self.array.item(value);

src/functions.rs

@@ -138,7 +138,7 @@ writer!(ExponentialFunction: |obj| {
     Self { dict }
 });
 
-impl<'a> ExponentialFunction<'a> {
+impl ExponentialFunction<'_> {
     common_func_methods!();
 
     /// Write the `/C0` array.
@@ -185,7 +185,7 @@ writer!(StitchingFunction: |obj| {
     Self { dict }
 });
 
-impl<'a> StitchingFunction<'a> {
+impl StitchingFunction<'_> {
     common_func_methods!();
 
     /// Write the `/Functions` array.
@@ -333,7 +333,7 @@ pub enum PostScriptOp<'a> {
     Roll,
 }
 
-impl<'a> PostScriptOp<'a> {
+impl PostScriptOp<'_> {
     /// Encode a slice of operations into a byte stream.
     pub fn encode(ops: &[Self]) -> Vec<u8> {
         let mut buf = Vec::new();

src/lib.rs

@@ -503,7 +503,7 @@ mod tests {
     #[test]
     fn test_binary_marker() {
         let mut w = Pdf::new();
-        w.set_binary_marker(&[b'A', b'B', b'C', b'D']);
+        w.set_binary_marker(b"ABCD");
         test!(
             w.finish(),
             b"%PDF-1.7\n%ABCD\n",