Merge branch 'bincode-org:trunk' into feature/mut-take-self

bincode-org · Oct 30, 2023 · a5e122b · a5e122b
2 parents 0caced3 + 39db1c8
commit a5e122b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -32,7 +32,7 @@
       },
       "steps": [
         {
-          "uses": "actions/checkout@v3",
+          "uses": "actions/checkout@v4",
           "name": "Checkout"
         },
         {
@@ -75,7 +75,7 @@
       },
       "steps": [
         {
-          "uses": "actions/checkout@v3",
+          "uses": "actions/checkout@v4",
           "name": "Checkout"
         },
         {
@@ -109,7 +109,7 @@
       },
       "steps": [
         {
-          "uses": "actions/checkout@v3",
+          "uses": "actions/checkout@v4",
           "name": "Checkout"
         },
         {
@@ -135,7 +135,7 @@
       "runs-on": "ubuntu-latest",
       "steps": [
         {
-          "uses": "actions/checkout@v3",
+          "uses": "actions/checkout@v4",
           "name": "Checkout"
         },
         {
@@ -171,7 +171,7 @@
       "runs-on": "ubuntu-latest",
       "steps": [
         {
-          "uses": "actions/checkout@v3",
+          "uses": "actions/checkout@v4",
           "name": "Checkout"
         },
         {

diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
@@ -12,7 +12,7 @@
       "runs-on": "ubuntu-latest",
       "steps": [
         {
-          "uses": "actions/checkout@v3"
+          "uses": "actions/checkout@v4"
         },
         {
           "uses": "actions-rs/audit-check@v1",

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "virtue"
-version = "0.0.14"
+version = "0.0.15"
 edition = "2021"
 description = "A sinless derive macro helper"
 license = "MIT"

diff --git a/src/generate/generate_item.rs b/src/generate/generate_item.rs
@@ -73,7 +73,7 @@ impl<'a> GenConst<'a> {
             builder
                 .punct('#')
                 .punct('!')
-                .group(Delimiter::Brace, |builder| {
+                .group(Delimiter::Bracket, |builder| {
                     builder.push_parsed(attr)?;
                     Ok(())
                 })?;
@@ -350,7 +350,7 @@ impl<'a, P: FnParent> FnBuilder<'a, P> {
 
         // attrs
         for attr in attrs {
-            builder.punct('#').group(Delimiter::Brace, |builder| {
+            builder.punct('#').group(Delimiter::Bracket, |builder| {
                 builder.push_parsed(attr)?;
                 Ok(())
             })?;

diff --git a/src/generate/impl.rs b/src/generate/impl.rs
@@ -45,7 +45,7 @@ impl<'a, P: Parent> Impl<'a, P> {
     /// Add a outer attribute to the trait implementation
     pub fn impl_outer_attr(&mut self, attr: impl AsRef<str>) -> Result {
         let mut builder = StreamBuilder::new();
-        builder.punct('#').group(Delimiter::Brace, |builder| {
+        builder.punct('#').group(Delimiter::Bracket, |builder| {
             builder.push_parsed(attr)?;
             Ok(())
         })?;

diff --git a/src/generate/impl_for.rs b/src/generate/impl_for.rs
@@ -80,7 +80,7 @@ impl<'a, P: Parent> ImplFor<'a, P> {
     /// Add a outer attribute to the trait implementation
     pub fn impl_outer_attr(&mut self, attr: impl AsRef<str>) -> Result {
         let mut builder = StreamBuilder::new();
-        builder.punct('#').group(Delimiter::Brace, |builder| {
+        builder.punct('#').group(Delimiter::Bracket, |builder| {
             builder.push_parsed(attr)?;
             Ok(())
         })?;

diff --git a/src/parse/generics.rs b/src/parse/generics.rs
@@ -554,7 +554,7 @@ impl GenericConstraints {
         builder.ident(generic.ident.clone());
         builder.punct(':');
         builder.push_parsed(constraint)?;
-        self.constraints.extend(builder.stream.into_iter());
+        self.constraints.extend(builder.stream);
 
         Ok(())
     }
@@ -575,7 +575,7 @@ impl GenericConstraints {
             builder.punct(',');
         }
         builder.push_parsed(constraint)?;
-        self.constraints.extend(builder.stream.into_iter());
+        self.constraints.extend(builder.stream);
 
         Ok(())
     }

diff --git a/test/derive/src/lib.rs b/test/derive/src/lib.rs
@@ -11,6 +11,7 @@ fn derive_ret_hi_inner(input: TokenStream) -> Result<TokenStream> {
     generator
         .generate_impl()
         .generate_fn("hi")
+        .with_attr("inline(never)")
         .with_self_arg(FnSelfArg::RefSelf)
         .with_return_type("&'static str")
         .body(|body| {