Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,17 @@ matrix:
- os: linux
rust: nightly
- os: osx
osx_image: xcode11
osx_image: xcode11.2
addons:
chrome: stable
firefox: latest
Comment thread
dvdplm marked this conversation as resolved.
install:
- curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | sh
- source ~/.nvm/nvm.sh
- nvm install --lts
- npm install -g chromedriver
- curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
- which chromedriver
rust: stable
allow_failures:
- rust: nightly
Expand All @@ -40,6 +50,5 @@ script:
- cd parity-util-mem/ && cargo test --no-default-features --features=dlmalloc-global && cd ..
- cd rlp/ && cargo test --no-default-features && cargo check --benches && cd ..
- cd triehash/ && cargo check --benches && cd ..
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
cd kvdb-web/ && wasm-pack test --headless --chrome --firefox && cd ..;
fi
- cd kvdb-web/ && wasm-pack test --headless --chrome --firefox && cd ..

2 changes: 1 addition & 1 deletion ethbloom/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl<'a> From<Input<'a>> for Hash<'a> {
keccak256.update(raw);
keccak256.finalize(&mut out);
Hash::Owned(out)
},
}
Input::Hash(hash) => Hash::Ref(hash),
}
}
Expand Down
11 changes: 2 additions & 9 deletions kvdb-rocksdb/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,7 @@ impl CompactionProfile {
let hdd_check_file = db_path
.to_str()
.and_then(|path_str| Command::new("df").arg(path_str).output().ok())
.and_then(|df_res| if df_res.status.success() {
Some(df_res.stdout)
} else {
None
})
.and_then(|df_res| if df_res.status.success() { Some(df_res.stdout) } else { None })
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a rustfmt change? I don't mind it, just curious.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

right, you can see it in the commit cargo fmt, otherwise ci was failing https://travis-ci.org/paritytech/parity-common/jobs/617128841#L217-L248

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

(rustfmt was enforced in #266)

.and_then(rotational_from_df_output);
// Read out the file and match compaction profile.
if let Some(hdd_check) = hdd_check_file {
Expand Down Expand Up @@ -151,10 +147,7 @@ impl CompactionProfile {

/// Slow HDD compaction profile
pub fn hdd() -> CompactionProfile {
CompactionProfile {
initial_file_size: 256 * MB as u64,
block_size: 64 * KB,
}
CompactionProfile { initial_file_size: 256 * MB as u64, block_size: 64 * KB }
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this a rustfmt change? I preferred the previous version but no big deal.

}
}

Expand Down
7 changes: 3 additions & 4 deletions rlp/src/rlpin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,9 @@ impl<'a> Rlp<'a> {
/// raw data slice.
///
/// Returns an error if this Rlp is not a list or if the index is out of range.
pub fn at_with_offset<'view>(&'view self, index: usize)
-> Result<(Rlp<'a>, usize), DecoderError>
where
'a: 'view,
pub fn at_with_offset<'view>(&'view self, index: usize) -> Result<(Rlp<'a>, usize), DecoderError>
where
'a: 'view,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same. I like this formatting, but it has nothing to do with this PR.

{
if !self.is_list() {
return Err(DecoderError::RlpExpectedToBeList);
Expand Down