prettyplease - cargo Package Compare versions

Comparing version 0.2.28 to 0.2.29

.cargo_vcs_info.json

 {
   "git": {
-    "sha1": "99d37c5387a7730cda4dd4c72e54f8fb5a4b1089"
+    "sha1": "fc5bf6b406b19758d910b6f6e9059e5f0301a2d8"
   },
   "path_in_vcs": ""
 }

Cargo.lock

@@ -13,3 +13,3 @@ # This file is automatically @generated by Cargo.
 name = "prettyplease"
-version = "0.2.28"
+version = "0.2.29"
 dependencies = [
@@ -16,0 +16,0 @@ "indoc",

Cargo.toml

@@ -16,3 +16,3 @@ # THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
 name = "prettyplease"
-version = "0.2.28"
+version = "0.2.29"
 authors = ["David Tolnay <[e-mail]>"]
@@ -19,0 +19,0 @@ build = "build.rs"

src/expr.rs

@@ -524,4 +524,4 @@ use crate::algorithm::{BreakToken, Printer};
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
@@ -577,4 +577,4 @@ self.offset(-INDENT);
             self.hardbreak();
-            for stmt in &expr.then_branch.stmts {
-                self.stmt(stmt);
+            for stmt in expr.then_branch.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
@@ -667,4 +667,4 @@ self.offset(-INDENT);
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
@@ -1032,4 +1032,4 @@ self.offset(-INDENT);
         self.inner_attrs(&expr.attrs);
-        for stmt in &expr.body.stmts {
-            self.stmt(stmt);
+        for stmt in expr.body.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
@@ -1112,4 +1112,4 @@ self.offset(-INDENT);
             self.inner_attrs(&body.attrs);
-            for stmt in &body.block.stmts {
-                self.stmt(stmt);
+            for stmt in body.block.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
@@ -1172,4 +1172,4 @@ self.offset(-INDENT);
                 _ => {
-                    for stmt in &block.stmts {
-                        self.stmt(stmt);
+                    for stmt in block.stmts.iter().delimited() {
+                        self.stmt(&stmt, stmt.is_last);
                     }
@@ -1176,0 +1176,0 @@ }

src/item.rs

 use crate::algorithm::Printer;
 use crate::fixup::FixupContext;
 use crate::iter::IterDelimited;
+use crate::mac;
 use crate::path::PathKind;
@@ -104,4 +105,4 @@ use crate::INDENT;
         self.inner_attrs(&item.attrs);
-        for stmt in &item.block.stmts {
-            self.stmt(stmt);
+        for stmt in item.block.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
@@ -173,3 +174,3 @@ self.offset(-INDENT);
         self.outer_attrs(&item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&item.mac.delimiter);
         self.mac(&item.mac, item.ident.as_ref(), semicolon);
@@ -842,3 +843,3 @@ self.hardbreak();
         self.outer_attrs(&foreign_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&foreign_item.mac.delimiter);
         self.mac(&foreign_item.mac, None, semicolon);
@@ -988,4 +989,4 @@ self.hardbreak();
             self.inner_attrs(&trait_item.attrs);
-            for stmt in &block.stmts {
-                self.stmt(stmt);
+            for stmt in block.stmts.iter().delimited() {
+                self.stmt(&stmt, stmt.is_last);
             }
@@ -1031,3 +1032,3 @@ self.offset(-INDENT);
         self.outer_attrs(&trait_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&trait_item.mac.delimiter);
         self.mac(&trait_item.mac, None, semicolon);
@@ -1189,4 +1190,4 @@ self.hardbreak();
         self.inner_attrs(&impl_item.attrs);
-        for stmt in &impl_item.block.stmts {
-            self.stmt(stmt);
+        for stmt in impl_item.block.stmts.iter().delimited() {
+            self.stmt(&stmt, stmt.is_last);
         }
@@ -1221,3 +1222,3 @@ self.offset(-INDENT);
         self.outer_attrs(&impl_item.attrs);
-        let semicolon = true;
+        let semicolon = mac::requires_semi(&impl_item.mac.delimiter);
         self.mac(&impl_item.mac, None, semicolon);
@@ -1740,4 +1741,4 @@ self.hardbreak();
                 self.inner_attrs(&item.attrs);
-                for stmt in body {
-                    self.stmt(stmt);
+                for stmt in body.iter().delimited() {
+                    self.stmt(&stmt, stmt.is_last);
                 }
@@ -1744,0 +1745,0 @@ self.offset(-INDENT);

src/lib.rs

@@ -323,3 +323,3 @@ //! [![github]](https://github.com/dtolnay/prettyplease) [![crates-io]](https://crates.io/crates/prettyplease) [![docs-rs]](https://docs.rs/prettyplease)
 
-#![doc(html_root_url = "https://docs.rs/prettyplease/0.2.28")]
+#![doc(html_root_url = "https://docs.rs/prettyplease/0.2.29")]
 #![allow(
@@ -326,0 +326,0 @@ clippy::bool_to_int_with_if,

src/lit.rs

@@ -47,8 +47,3 @@ use crate::algorithm::Printer;
     fn lit_float(&mut self, lit: &LitFloat) {
-        let repr = lit.token().to_string();
-        let dot = repr.ends_with('.');
-        self.word(repr);
-        if dot {
-            self.word("0");
-        }
+        self.word(lit.token().to_string());
     }
@@ -55,0 +50,0 @@

src/mac.rs

@@ -44,6 +44,3 @@ use crate::algorithm::Printer;
         if semicolon {
-            match mac.delimiter {
-                MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => self.word(";"),
-                MacroDelimiter::Brace(_) => {}
-            }
+            self.word(";");
         }
@@ -216,2 +213,9 @@ }
 
+pub(crate) fn requires_semi(delimiter: &MacroDelimiter) -> bool {
+    match delimiter {
+        MacroDelimiter::Paren(_) | MacroDelimiter::Bracket(_) => true,
+        MacroDelimiter::Brace(_) => false,
+    }
+}
+
 fn is_keyword(ident: &Ident) -> bool {
@@ -218,0 +222,0 @@ match ident.to_string().as_str() {

src/stmt.rs

@@ -5,2 +5,3 @@ use crate::algorithm::Printer;
 use crate::fixup::FixupContext;
+use crate::mac;
 use crate::INDENT;
@@ -10,3 +11,3 @@ use syn::{BinOp, Expr, Stmt};
 impl Printer {
-    pub fn stmt(&mut self, stmt: &Stmt) {
+    pub fn stmt(&mut self, stmt: &Stmt, is_last: bool) {
         match stmt {
@@ -74,3 +75,4 @@ Stmt::Local(local) => {
                 self.outer_attrs(&stmt.attrs);
-                let semicolon = true;
+                let semicolon = stmt.semi_token.is_some()
+                    || !is_last && mac::requires_semi(&stmt.mac.delimiter);
                 self.mac(&stmt.mac, None, semicolon);
@@ -77,0 +79,0 @@ self.hardbreak();

No alert changes

No metric changes