Skip to content

Commit f9729d5

Browse files
Seulgi Kimsgkim126
Seulgi Kim
authored andcommitted
Upgrade rust toolchains
1 parent b1bf040 commit f9729d5

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

.github/workflows/cargo-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v1
1111
- uses: actions-rs/toolchain@v1
1212
with:
13-
toolchain: nightly-2019-10-13
13+
toolchain: nightly-2019-11-06
1414
override: true
1515
- run: rustup component add clippy
1616
- run: cargo fetch --verbose
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v1
2424
- uses: actions-rs/toolchain@v1
2525
with:
26-
toolchain: nightly-2019-10-13
26+
toolchain: nightly-2019-11-06
2727
override: true
2828
- run: rustup component add rustfmt
2929
- run: cargo fmt -- --check

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,32 +135,32 @@ You can create a block by sending a transaction through [JSON-RPC](https://githu
135135
Make sure you run `rustfmt` before creating a PR to the repo. You need to install the nightly-2018-12-06 version of `rustfmt`.
136136
137137
```sh
138-
rustup toolchain install nightly-2019-10-13
139-
rustup component add rustfmt --toolchain nightly-2019-10-13
138+
rustup toolchain install nightly-2019-11-06
139+
rustup component add rustfmt --toolchain nightly-2019-11-06
140140
```
141141
142142
To run `rustfmt`,
143143
144144
```sh
145-
cargo +nightly-2019-10-13 fmt
145+
cargo +nightly-2019-11-06 fmt
146146
```
147147
148148
## Linting
149149
150150
You should run `clippy` also. This is a lint tool for rust. It suggests more efficient/readable code.
151151
You can see [the clippy document](https://rust-lang.github.io/rust-clippy/master/index.html) for more information.
152-
You need to install the nightly-2019-10-13 version of `clippy`.
152+
You need to install the nightly-2019-11-06 version of `clippy`.
153153
154154
### Install
155155
```sh
156-
rustup toolchain install nightly-2019-10-13
157-
rustup component add clippy --toolchain nightly-2019-10-13
156+
rustup toolchain install nightly-2019-11-06
157+
rustup component add clippy --toolchain nightly-2019-11-06
158158
```
159159
160160
### Run
161161
162162
```sh
163-
cargo +nightly-2019-10-13 clippy --all --all-targets
163+
cargo +nightly-2019-11-06 clippy --all --all-targets
164164
```
165165
166166
## Testing

network/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ impl Client {
230230

231231
pub fn extension_versions(&self) -> Vec<(String, Vec<u64>)> {
232232
let extensions = self.extensions.read();
233-
extensions.iter().map(|(name, extension)| (name.to_string(), extension.versions.clone())).collect()
233+
extensions.iter().map(|(name, extension)| ((*name).to_string(), extension.versions.clone())).collect()
234234
}
235235

236236
pub fn on_node_removed(&self, id: &NodeId) {

network/src/stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl<Stream: TryRead + TryWrite + PeerAddr + Shutdown> TryStream<Stream> {
124124
Ok(None)
125125
}
126126

127-
fn read_len(&mut self) -> Result<Option<(Vec<u8>)>> {
127+
fn read_len(&mut self) -> Result<Option<Vec<u8>>> {
128128
debug_assert_eq!(None, self.read);
129129
let mut bytes: Vec<u8> = vec![0];
130130

rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ reorder_modules = true
3434
# reorder_impl_items = false
3535
# report_todo = "Never"
3636
# report_fixme = "Never"
37-
# skip_children = false
3837
space_after_colon = true
3938
space_before_colon = false
4039
struct_field_align_threshold = 0

0 commit comments

Comments
 (0)