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

Update to Rust 2018 #184

Merged
merged 2 commits into from
Feb 22, 2019
Merged

Update to Rust 2018 #184

merged 2 commits into from
Feb 22, 2019

Conversation

nrc
Copy link
Contributor

@nrc nrc commented Feb 19, 2019

The first commit is the update, it is all pretty straightforward. The second commit removes the rust-toolchain file because I think it is a better developer experience not to have it checked in.

@Hoverbear @brson PTAL

@Hoverbear Hoverbear added this to the 0.6.0 milestone Feb 19, 2019
@Hoverbear Hoverbear added the Feature Related to a major feature. label Feb 19, 2019
Hoverbear
Hoverbear previously approved these changes Feb 19, 2019
Copy link
Contributor

@Hoverbear Hoverbear left a comment

Choose a reason for hiding this comment

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

Rest LGTM, just worried about the changes to eraftpb.rs.

@nrc
Copy link
Contributor Author

nrc commented Feb 20, 2019

I've updated generate-proto.sh to rerun cargo fix so we don't lose the changes.

@Hoverbear
Copy link
Contributor

@nrc Great, that solves that problem!

Hoverbear
Hoverbear previously approved these changes Feb 20, 2019
@nrc nrc mentioned this pull request Feb 20, 2019
brson
brson previously approved these changes Feb 21, 2019
@brson
Copy link

brson commented Feb 21, 2019

LGTM

@nrc
Copy link
Contributor Author

nrc commented Feb 21, 2019

Rebased, reviewed, ready to merge

@Hoverbear
Copy link
Contributor

@nrc Builds are failing at the moment. :(

The toolchains tested on CI are specified in their own ways, so this is only
used for local builds where developers. Its better for developers not to have
this file around in case they have their own preferences.
@nrc
Copy link
Contributor Author

nrc commented Feb 22, 2019

@Hoverbear fixed!

@Hoverbear
Copy link
Contributor

Forcing merge with LGTMs from me and @brson (there was a rebase)

@Hoverbear Hoverbear merged commit addddd2 into tikv:master Feb 22, 2019
Hoverbear pushed a commit that referenced this pull request Apr 23, 2019
* Regenerate

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Update to Rust 2018 (#184)

* Migrate to Rust 2018

* Remove rust-toolchain file

The toolchains tested on CI are specified in their own ways, so this is only
used for local builds where developers. Its better for developers not to have
this file around in case they have their own preferences.

(cherry picked from commit addddd2)
Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Migration leftovers

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Fix compilation errors under `src`

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Fix most test failings

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Remove some unintentional changes produced by careless merging

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Use tikv/protobuf-build#3

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Fix warning

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Fix tests

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Bump protobuf-build to 0.4.2

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Address some warnings (#219)

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Address comments: add `Codec` back, replace protobuf version with 2

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Address nightly warnings

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>

* Remove the whole `cfg_attr`

Signed-off-by: ice1000 <ice1000kotlin@foxmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Related to a major feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants