Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into 0.8.x #504

Merged
merged 122 commits into from Dec 24, 2020
Merged

Merge master into 0.8.x #504

merged 122 commits into from Dec 24, 2020

Conversation

KodrAus
Copy link
Member

@KodrAus KodrAus commented Dec 21, 2020

This PR merges the current master branch into 0.8.x along with a new commit that reverts the breaking change to from_guid. I'll give the diff another look over, but this should let us push a new 0.8.x release with the last year's worth of effort.

Closes:

kinggoesgaming and others added 30 commits October 20, 2019 00:00
437: GitHub actions/fmt r=KodrAus a=kinggoesgaming

**I'm submitting a(n)** other

# Description
Moves `cargo fmt` step to Github Actions

# Motivation
Overall Github Actions provide more flexibility for us. 
But since Actions are still in beta, starting with fmt is a relatively safe start


Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
(don't edit files on the go on iPhone, really doesnt work)
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Currently it is broken and we can probably just leave with manually checking clippy output
439: Introduce Clippy Github Actions r=Dylan-DPC a=kinggoesgaming

**I'm submitting a(n)** other

# Description
Moves clippy tests over to Github Actions

Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Updates the requirements on [md5](https://github.com/stainless-steel/md5) to permit the latest version.
- [Release notes](https://github.com/stainless-steel/md5/releases)
- [Commits](https://github.com/stainless-steel/md5/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
442: Update md5 requirement from 0.6 to 0.7 r=kinggoesgaming a=dependabot-preview[bot]

Updates the requirements on [md5](https://github.com/stainless-steel/md5) to permit the latest version.
<details>
<summary>Commits</summary>

- See full diff in [compare view](https://github.com/stainless-steel/md5/commits)
</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 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)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Reduces the number of dependencies.
amadeusine and others added 7 commits September 22, 2020 11:03
466: Substitute unwrap for ? operator r=KodrAus a=amadeusine

<!--
    If this PR is a breaking change, ensure that you are opening it against 
    the `breaking` branch.  If the pull request is incomplete, prepend the Title with WIP: 
-->

**I'm submitting a** refactor (and fixes for test cases).

# Description

This PR addresses C-QUESTION-MARK in the roadmap for #191. The examples have been updated to accommodate for the `?` operator instead of `.unwrap` or `try!`.

# Motivation

UUID can move forward with other portions of documentation given this has been completed.

# Tests
<!-- How are these changes tested? -->

All existing tests remain successful after changes.

# Related Issue(s)

#191 


Co-authored-by: Samuel Lim <sclg9w@mail.umkc.edu>
Co-authored-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Co-authored-by: Samuel Lim <39858145+amadeusine@users.noreply.github.com>
This raises the MSRV to getrandom's, 1.34.0.
503: Un-breaking-change Uuid::new_v4 r=KodrAus a=CAD97

<!--
    If this PR is a breaking change, ensure that you are opening it against 
    the `breaking` branch.  If the pull request is incomplete, prepend the Title with WIP: 
-->

**I'm submitting a(n)** refactor

# Description

#447 changed from using `rand::thread_rng` to using `getrandom` in `Uuid::new_v4`. This also changed the return type from `Uuid` to `Result<Uuid, getrandom::Error>`. This PR reverts the signature to the simpler `new_v4() -> Uuid`.

# Motivation

This signature is much simpler to use, and avoids a breaking change. `getrandom` is _highly_ unlikely to fail, and previously we used `thread_rng` here, which also panics if it fails to initialize from the OS entropy source. If `getrandom` fails, it is highly unlikely that any program creating v4 UUIDs has any reasonable recovery other than to abort, as the system is in a broken state.

If users absolutely need to recover in this situation, they can call `getrandom` first themselves to make sure that their system is working, or generate the bytes themselves and create the UUID from those bytes.

Additionally, actually wrapping `getrandom::Error` in `uuid::Error` comes with its own fun set of problems, described in #502.

# Tests

N/A

# Related Issue(s)

#475: this undoes the breaking change to `Uuid::new_v4`, thus making the requested publish a patch update

Closes #502: alternate approach to the same TODO

Co-authored-by: CAD97 <cad97@cad97.com>
Update to getrandom:0.2.0
This reverts commit e0c7b17, reversing
changes made to f177d20.
@KodrAus
Copy link
Member Author

KodrAus commented Dec 21, 2020

I'll leave this open for a bit so we get a chance to get some more eyes on the diff in case I missed any other breaking changes.

The entire module is already feature-gated in `lib.rs`.
It now states that it was trying to deserialize a UUID, which was
unclear before.
src/lib.rs Outdated Show resolved Hide resolved
bors bot and others added 3 commits December 22, 2020 21:23
505: Improve deserialization error message r=kinggoesgaming a=jplatte

**I'm submitting a** refactor

# Description

Improves the deserialization error message by including that a UUID was attempted to be parsed.

Before: `invalid length: expected one of [36, 32], found 11`
After: `UUID parsing failed: invalid length: expected one of [36, 32], found 11`

# Motivation

It was not easy to tell from the previous error message what went wrong when trying to deserialize a larger object containing a UUID.

# Tests

I added a unit test.

# Related Issue(s)

Closes #499

Co-authored-by: Jonas Platte <jonas@lumeo.com>
rework description of wasm crate features
@KodrAus
Copy link
Member Author

KodrAus commented Dec 23, 2020

Once this goes green I'll merge it in and prepare a release for 0.8.2.

Copy link
Member

@kinggoesgaming kinggoesgaming left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@kinggoesgaming
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Dec 24, 2020

Build succeeded:

@bors bors bot merged commit 4b15a39 into uuid-rs:0.8.x Dec 24, 2020
@CAD97
Copy link
Contributor

CAD97 commented Dec 29, 2020

Reminder that 0.8.2 wants to be published 🙂

@kinggoesgaming
Copy link
Member

Yup still looking at if any minor PRs (documentation etc) can be squeezed in.

@KodrAus KodrAus mentioned this pull request Jan 8, 2021
bors bot added a commit that referenced this pull request Jan 11, 2021
508: prepare for 0.8.2 release r=KodrAus a=KodrAus

Includes:

- #504 
- #505 
- #506 

Co-authored-by: Ashley Mannix <kodraus@hey.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet