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.

Sign up for GitHub

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

Jump to bottom

Fix some typos in code and comments #421

Merged
merged 3 commits into from
Mar 15, 2021
Merged

Fix some typos in code and comments #421

merged 3 commits into from
Mar 15, 2021

Conversation

debug-zhang
Copy link
Contributor

Fix some typos while reading the lib.

One in src/tracker/state.rs, ProgressState::Snapshot => write! should be StateSnapshot.

impl Display for ProgressState {
    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
        match self {
            ProgressState::Probe => write!(f, "StateProbe"),
            ProgressState::Replicate => write!(f, "StateReplicate"),
            ProgressState::Snapshot => write!(f, "StateSnaphot"),
        }
    }
}

Others are some typos in comments.

storagezhang added 2 commits March 14, 2021 17:10
BusyJay
BusyJay previously approved these changes Mar 14, 2021
View reviewed changes
Copy link
Member

@BusyJay BusyJay left a comment

Choose a reason for hiding this comment

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

Thanks!

@BusyJay BusyJay requested a review from NingLin-P March 14, 2021 09:40
NingLin-P
NingLin-P reviewed Mar 14, 2021
View reviewed changes
Copy link
Member

@NingLin-P NingLin-P 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, thank you!

src/util.rs Outdated Show resolved Hide resolved
@debug-zhang
Copy link
Contributor Author

@NingLin-P Finished!

NingLin-P
NingLin-P previously approved these changes Mar 15, 2021
View reviewed changes
@debug-zhang
Copy link
Contributor Author

@BusyJay @NingLin-P

Sorry to bother you, but I can't quite understand this.

Why The Travis CI build failed ?

I just modify comments, and int Job log it's shown:

error: custom inner attributes are unstable
 --> /home/travis/build/tikv/raft-rs/target/debug/build/raft-proto-bab3413823f45325/out/protos/eraftpb.rs:9:4
  |
9 | #![rustfmt::skip]
  |    ^^^^^^^^^^^^^
  |
  = note: `#[deny(soft_unstable)]` on by default
  = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
  = note: for more information, see issue #64266 <https://github.com/rust-lang/rust/issues/64266>
error: aborting due to previous error
error: could not compile `raft-proto`
To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
The command "cargo test --all -- --nocapture" exited with 101.

I don't know what's wrong.

Thanks!

@debug-zhang
Copy link
Contributor Author

I recommitted and try to check for errors but failed.

The Travis CI still failed in Rust: nightly.

BusyJay
BusyJay approved these changes Mar 15, 2021
View reviewed changes
Copy link
Member

@BusyJay BusyJay left a comment

Choose a reason for hiding this comment

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

It's unrelated to your changes.

@BusyJay BusyJay merged commit a70a7a6 into tikv:master Mar 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BusyJay BusyJay BusyJay approved these changes

@NingLin-P NingLin-P Awaiting requested review from NingLin-P

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@debug-zhang @BusyJay @NingLin-P