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 breaking #164

Closed
wants to merge 61 commits into from
Closed

Merge master into breaking #164

wants to merge 61 commits into from

Conversation

kinggoesgaming
Copy link
Member

@kinggoesgaming kinggoesgaming commented Mar 10, 2018

NOTE Do not merge until before breaking actually gets breaking changes to merge commits count low

Description

Merge changes from master into breaking

Motivation

Routine commit update

Tests

N/A

Related Issue(s)

N/A

kinggoesgaming and others added 10 commits March 1, 2018 14:09
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>
clippy takes forever to build

Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
163: Clippy r=Dylan-DPC a=kinggoesgaming

![image](https://user-images.githubusercontent.com/15664607/36952547-48806ef8-1fc6-11e8-8c1d-729dcce2c339.png)

~~This is declared a breaking change as per clippy requesting that `Hash` be derived, as @Dylan-DPC asked.~~
Dylan-DPC-zz
Dylan-DPC-zz previously approved these changes Mar 10, 2018
@kinggoesgaming kinggoesgaming changed the title Merge master into breaking WIP: Merge master into breaking Mar 10, 2018
* [x] `extern crate`s
* [x] already provided `mod`s

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>
167: Use cfg-if to create logical feature gate implementations r=kinggoesgaming a=kinggoesgaming

<!--
    As we are working towards a stable version of uuid, we require that you 
    open an issue, before submitting a pull request. If the pull request is 
    imcomplete, prepend the Title with WIP: 
-->

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [x] refactor

# Description
`uuid` now adds `cfg-if` as a dependency.  With this, `#[cfg(..)]` implementations are easier to understand, as they can be handled in a more logical view because the macro allows us to `if` statements to make the checks more rustic at the source level

# Motivation
Understanding feature gate implementation becomes easier.

# Tests
The CI builds passing should be plenty.

# Related Issue(s)
#147
@kinggoesgaming
Copy link
Member Author

Seemingly WIP bot is broken again, if needed disable it for merge and enable again

@kinggoesgaming
Copy link
Member Author

bors try

bors bot added a commit that referenced this pull request Mar 21, 2018
@bors
Copy link
Contributor

bors bot commented Mar 21, 2018

try

Build failed

@kinggoesgaming
Copy link
Member Author

no idea why it failed... fmt locally shows no errors

Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Dylan-DPC-zz
Dylan-DPC-zz previously approved these changes Mar 22, 2018
kinggoesgaming and others added 3 commits March 24, 2018 20:12
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
182: move test Uuid creation functions into new module r=Dylan-DPC a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [x] refactor

# Description
Refactor the `tests::new` and `tests::new2` functions into `test_util` module.

# Motivation
Part of the great refactor. Allows different tests in different modules access the test constructors for `Uuid`

# Tests
The tests are passing

# Related Issue(s)
#124
kinggoesgaming and others added 5 commits March 25, 2018 18:25
Signed-off-by: Hunar Roop Kahlon <hunar.roop@gmail.com>
185: move slog implementation into its own module r=kinggoesgaming a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [ ] feature enhancement
  - [ ] deprecation or removal
  - [x] refactor

# Description
The slog impl and tests are moved into `slog_support` module

# Motivation
As part of the refactor effort, feature gated implementations need to be moved into their own modules.

# Tests
Current provided tests are passing

# Related Issue(s)
#124
177: introduce the `uuid` prelude r=Dylan-DPC a=kinggoesgaming

**I'm submitting a ...**
  - [ ] bug fix
  - [x] feature enhancement
  - [ ] deprecation or removal
  - [ ] refactor

# Description
Introduce the `prelude` module that provide the core types.

# Motivation
Provide the stable types that are important for users of `uuid`

# Tests
N/A

# Related Issue(s)
closes #166
@kinggoesgaming
Copy link
Member Author

I will open a separate PR that fixes the conflicts and such on a different branch

@kinggoesgaming
Copy link
Member Author

Superseded by #186

bors bot added a commit that referenced this pull request Mar 27, 2018
186: Merge master changes into breaking r=Dylan-DPC a=kinggoesgaming

Supersedes #164
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.

3 participants