Skip to content

Commit

Permalink
chore(deps): update derive_more requirement from 0.99.17 to 1.0.0 (#1419
Browse files Browse the repository at this point in the history
)

Updates the requirements on
[derive_more](https://github.com/JelteF/derive_more) to permit the
latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/JelteF/derive_more/blob/v0.99.18/CHANGELOG.md">derive_more's
changelog</a>.</em></p>
<blockquote>
<h2>0.99.18 - 2024-06-15</h2>
<ul>
<li>Update syn to version 2.x</li>
<li>Bump minimum supported rust version to 1.65</li>
</ul>
<h2>0.99.10 - 2020-09-11</h2>
<h3>Improvements</h3>
<ul>
<li><code>From</code> supports additional types for conversion:
<code>#[from(types(u8, u16))]</code>.</li>
</ul>
<h2>0.99.7 - 2020-05-16</h2>
<h3>Fixes</h3>
<ul>
<li>Fix generic derives for <code>MulAssign</code></li>
</ul>
<h3>Improvements</h3>
<ul>
<li>When specifying specific features of the crate to only enable
specific
derives, the <code>extra-traits</code> feature of <code>syn</code> is
not always enabled
when those the specified features do not require it. This should speed
up
compile time of <code>syn</code> when this feature is not needed.</li>
</ul>
<h2>0.99.6 - 2020-05-13</h2>
<h3>Improvements</h3>
<ul>
<li>Make sure output of derives is deterministic, for better support in
rust-analyzer</li>
</ul>
<h2>0.99.5 - 2020-03-28</h2>
<h3>New features</h3>
<ul>
<li>Support for deriving <code>Error</code>!!! (many thanks to <a
href="https://github.com/ffuugoo"><code>@​ffuugoo</code></a> and <a
href="https://github.com/tyranron"><code>@​tyranron</code></a>)</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>
<p>Fix generic bounds for <code>Deref</code> and <code>DerefMut</code>
with <code>forward</code>, i.e. put <code>Deref</code>
bound on whole type, so on <code>where Box&lt;T&gt;: Deref</code>
instead of on <code>T: Deref</code>.
(<a
href="https://redirect.github.com/JelteF/derive_more/issues/114">#107</a>)</p>
</li>
<li>
<p>The <code>tests</code> directory is now correctly included in the
crate (requested by
Debian package maintainers)</p>
</li>
</ul>
<h2>0.99.4 - 2020-03-28</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/JelteF/derive_more/commit/678a4735bc540b7363c6dadddc4bb273fdf74468"><code>678a473</code></a>
chore: Release derive_more version 0.99.18</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/fcde5568cb2a815b8d85fceb6dd8fd56750d2b25"><code>fcde556</code></a>
Include example published package</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/89cbd82959034284f7a2eeffb1976bc41a75b95f"><code>89cbd82</code></a>
Remove track_caller feature detection because msrv was bumped</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/db36f6dade1cf512ff71961882bda6467a639a31"><code>db36f6d</code></a>
Fix question marks</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/f0c2530255b21d9f791ee6e4acb6375c2becc641"><code>f0c2530</code></a>
fmt</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/461db95716ac91f60ee4877bb94c474b5fa25ca7"><code>461db95</code></a>
Fix issue when compiling on 1.65</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/39ad36fd7117acb0a8140d3aa63899ecc46b53c6"><code>39ad36f</code></a>
Update changelog for v0.99.18</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/57b6e1746e1ddf4c67e16b5e82f12e19ef02a3d5"><code>57b6e17</code></a>
Update to syn 2</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/ea4fa940033682ca16e1040688963011404d02a0"><code>ea4fa94</code></a>
Fix tests</li>
<li><a
href="https://github.com/JelteF/derive_more/commit/ab82aef0bf0c4f4e5cc837e3de3a78a373bc922b"><code>ab82aef</code></a>
Ignore error doctests as it still contains old backtrace logic</li>
<li>Additional commits viewable in <a
href="https://github.com/JelteF/derive_more/compare/v0.99.17...v0.99.18">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Seyon Sivarajah <seyon.sivarajah@quantinuum.com>
  • Loading branch information
dependabot[bot] and ss2165 authored Aug 13, 2024
1 parent 937883d commit 3bf968f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ context-iterators = "0.2.0"
cool_asserts = "2.0.3"
criterion = "0.5.1"
delegate = "0.12.0"
derive_more = "0.99.17"
derive_more = "1.0.0"
downcast-rs = "1.2.0"
enum_dispatch = "0.3.11"
html-escape = "0.2.13"
Expand Down
2 changes: 1 addition & 1 deletion hugr-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ serde = { workspace = true, features = ["derive", "rc"] }
serde_yaml = { workspace = true, optional = true }
typetag = { workspace = true }
smol_str = { workspace = true, features = ["serde"] }
derive_more = { workspace = true }
derive_more = { workspace = true, features=["display", "from"]}
itertools = { workspace = true }
html-escape = { workspace = true }
bitvec = { workspace = true, features = ["serde"] }
Expand Down
11 changes: 5 additions & 6 deletions hugr-core/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,20 +218,19 @@ pub enum TypeEnum<RV: MaybeRV> {
#[allow(missing_docs)]
Extension(CustomType),
#[allow(missing_docs)]
#[display(fmt = "Alias({})", "_0.name()")]
#[display("Alias({})", _0.name())]
Alias(AliasDecl),
#[allow(missing_docs)]
#[display(fmt = "Function({})", "_0")]
#[display("Function({_0})")]
Function(Box<FuncValueType>),
// Index into TypeParams, and cache of TypeBound (checked in validation)
#[allow(missing_docs)]
#[display(fmt = "Variable({})", _0)]
#[display("Variable({_0})")]
Variable(usize, TypeBound),
/// RowVariable. Of course, this requires that `RV` has instances, [NoRV] doesn't.
#[display(fmt = "RowVar({})", _0)]
#[display("RowVar({_0})")]
RowVar(RV),
#[allow(missing_docs)]
#[display(fmt = "{}", "_0")]
Sum(SumType),
}

Expand All @@ -255,7 +254,7 @@ impl<RV: MaybeRV> TypeEnum<RV> {
}

#[derive(Clone, Debug, Eq, Hash, derive_more::Display, serde::Serialize, serde::Deserialize)]
#[display(fmt = "{}", "_0")]
#[display("{_0}")]
#[serde(
into = "serialize::SerSimpleType",
try_from = "serialize::SerSimpleType"
Expand Down
3 changes: 1 addition & 2 deletions hugr-core/src/types/poly_func.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//! Polymorphic Function Types

use crate::extension::{ExtensionRegistry, SignatureError};
use itertools::Itertools;
#[cfg(test)]
use {
crate::proptest::RecursionDepth,
Expand All @@ -24,7 +23,7 @@ use super::{signature::FuncTypeBase, MaybeRV, NoRV, RowVariable};
)]
#[cfg_attr(test, derive(Arbitrary), proptest(params = "RecursionDepth"))]
#[display(
fmt = "forall {}. {}",
"forall {}. {}",
"params.iter().map(ToString::to_string).join(\" \")",
"body"
)]
Expand Down
2 changes: 1 addition & 1 deletion hugr-core/src/types/row_var.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use proptest::prelude::{any, BoxedStrategy, Strategy};
#[derive(
Clone, Debug, Eq, Hash, PartialEq, derive_more::Display, serde::Serialize, serde::Deserialize,
)]
#[display(fmt = "{}", "_0")]
#[display("{_0}")]
pub struct RowVariable(pub usize, pub TypeBound);

// Note that whilst 'pub' this is not re-exported outside private module `row_var`
Expand Down
5 changes: 2 additions & 3 deletions hugr-core/src/types/type_param.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//!
//! [`TypeDef`]: crate::extension::TypeDef

use itertools::Itertools;
#[cfg(test)]
use proptest_derive::Arbitrary;
use std::num::NonZeroU64;
Expand All @@ -21,7 +20,7 @@ use crate::extension::SignatureError;
#[derive(
Clone, Debug, PartialEq, Eq, Hash, derive_more::Display, serde::Deserialize, serde::Serialize,
)]
#[display(fmt = "{}", "_0.map(|i|i.to_string()).unwrap_or(\"-\".to_string())")]
#[display("{}", "_0.map(|i|i.to_string()).unwrap_or(\"-\".to_string())")]
#[cfg_attr(test, derive(Arbitrary))]
pub struct UpperBound(Option<NonZeroU64>);
impl UpperBound {
Expand Down Expand Up @@ -76,7 +75,7 @@ pub enum TypeParam {
param: Box<TypeParam>,
},
/// Argument is a [TypeArg::Sequence]. A tuple of parameters.
#[display(fmt = "Tuple({})", "params.iter().map(|t|t.to_string()).join(\", \")")]
#[display("Tuple({})", "params.iter().map(|t|t.to_string()).join(\", \")")]
Tuple {
/// The [TypeParam]s contained in the tuple.
params: Vec<TypeParam>,
Expand Down

0 comments on commit 3bf968f

Please sign in to comment.