Skip to content

Commit 4b845f8

Browse files
alecmocattaalecmocatta
committed
Merge remote-tracking branch 'template/master' into template
2 parents 3aad860 + d1f50da commit 4b845f8

18 files changed

+136
-179
lines changed

‎.appveyor.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.circleci/config.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
/target
2+
**/*.rs.bk
13
Cargo.lock
2-
target

‎.mergify.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
pull_request_rules:
2+
- name: automatic merge
3+
conditions:
4+
- base=master
5+
- status-success=tests
6+
- label!=work-in-progress
7+
- "#approved-reviews-by>=1"
8+
- "#review-requested=0"
9+
- "#changes-requested-reviews-by=0"
10+
- "#commented-reviews-by=0"
11+
actions:
12+
merge:
13+
method: merge
14+
strict: smart
15+
delete_head_branch: {}
16+
- name: automatic merge
17+
conditions:
18+
- base=master
19+
- status-success=tests
20+
- label!=work-in-progress
21+
- author=alecmocatta # https://github.com/Mergifyio/mergify-engine/issues/451
22+
- "#review-requested=0"
23+
- "#changes-requested-reviews-by=0"
24+
- "#commented-reviews-by=0"
25+
actions:
26+
merge:
27+
method: merge
28+
strict: smart
29+
delete_head_branch: {}
30+
- name: dismiss reviews
31+
conditions: []
32+
actions:
33+
dismiss_reviews: {}
34+
- name: auto add wip label
35+
conditions:
36+
- "title~=^WIP: .*"
37+
actions:
38+
label:
39+
add: ["work-in-progress"]
40+
- name: auto remove wip label
41+
conditions:
42+
- "-title~=^WIP: .*"
43+
actions:
44+
label:
45+
remove: ["work-in-progress"]

‎.rustfmt.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
fn_args_density = "Compressed"
21
hard_tabs = true
32
imports_layout = "Horizontal"
43
merge_imports = true
5-
# reorder_impl_items = true # currently nondeterministic, breaks check
4+
fn_args_layout = "Compressed"
65
use_field_init_shorthand = true
7-
use_try_shorthand = true
8-
# wrap_comments = true
6+
7+
# To enable when stable
8+
# wrap_comments = true # https://github.com/rust-lang/rustfmt/issues/3347
9+
# reorder_impl_items = true # https://github.com/rust-lang/rustfmt/issues/3363

‎.travis.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "streaming_algorithms"
33
version = "0.1.0"
4-
license = "Apache-2.0"
4+
license = "MIT OR Apache-2.0"
55
authors = ["Alec Mocatta <alec@mocatta.net>"]
66
categories = ["data-structures","algorithms","science"]
77
keywords = ["streaming-algorithm","probabilistic","sketch","data-structure","hyperloglog"]
@@ -12,18 +12,15 @@ repository = "https://github.com/alecmocatta/streaming_algorithms"
1212
homepage = "https://github.com/alecmocatta/streaming_algorithms"
1313
documentation = "https://docs.rs/streaming_algorithms/0.1.0"
1414
readme = "README.md"
15+
edition = "2018"
1516

1617
[badges]
17-
appveyor = { repository = "alecmocatta/streaming_algorithms" }
18-
circle-ci = { repository = "alecmocatta/streaming_algorithms" }
19-
#gitlab = { repository = "alecmocatta/streaming_algorithms" }
20-
travis-ci = { repository = "alecmocatta/streaming_algorithms" }
21-
18+
azure-devops = { project = "alecmocatta/streaming_algorithms", pipeline = "tests" }
2219
maintenance = { status = "actively-developed" }
2320

2421
[dependencies]
2522
twox-hash = "1.1"
2623
serde_derive = "1.0"
27-
serde = "1.0"
24+
serde = { version = "1.0", features = ["derive"] }
2825
rand = "0.5"
2926
packed_simd = { version = "0.3", features = ["into_bits"] }

‎LICENSE.txt renamed to ‎LICENSE-APACHE.txt

File renamed without changes.

‎LICENSE-MIT.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Permission is hereby granted, free of charge, to any
2+
person obtaining a copy of this software and associated
3+
documentation files (the "Software"), to deal in the
4+
Software without restriction, including without
5+
limitation the rights to use, copy, modify, merge,
6+
publish, distribute, sublicense, and/or sell copies of
7+
the Software, and to permit persons to whom the Software
8+
is furnished to do so, subject to the following
9+
conditions:
10+
11+
The above copyright notice and this permission notice
12+
shall be included in all copies or substantial portions
13+
of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
16+
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
17+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
18+
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
19+
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
22+
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

‎README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
# streaming_algorithms
22

3-
[![Crates.io](https://img.shields.io/crates/v/streaming_algorithms.svg?style=flat-square&maxAge=86400)](https://crates.io/crates/streaming_algorithms)
4-
[![Apache-2.0 licensed](https://img.shields.io/crates/l/streaming_algorithms.svg?style=flat-square&maxAge=2592000)](LICENSE.txt)
5-
[![Build Status](https://ci.appveyor.com/api/projects/status/github/alecmocatta/streaming_algorithms?branch=master&svg=true)](https://ci.appveyor.com/project/alecmocatta/streaming-algorithms)
6-
[![Build Status](https://circleci.com/gh/alecmocatta/streaming_algorithms/tree/master.svg?style=shield)](https://circleci.com/gh/alecmocatta/streaming_algorithms)
7-
[![Build Status](https://travis-ci.com/alecmocatta/streaming_algorithms.svg?branch=master)](https://travis-ci.com/alecmocatta/streaming_algorithms)
3+
[![Crates.io](https://img.shields.io/crates/v/streaming_algorithms.svg?maxAge=86400)](https://crates.io/crates/streaming_algorithms)
4+
[![MIT / Apache 2.0 licensed](https://img.shields.io/crates/l/streaming_algorithms.svg?maxAge=2592000)](#License)
5+
[![Build Status](https://dev.azure.com/alecmocatta/template-rust/_apis/build/status/tests?branchName=master)](https://dev.azure.com/alecmocatta/template-rust/_build/latest?branchName=master)
86

97
[Docs](https://docs.rs/streaming_algorithms/0.1.0)
108

@@ -30,6 +28,11 @@ See [this gist](https://gist.github.com/debasishg/8172796) for a good list of fu
3028
As these implementations are often in hot code paths, unsafe is used, albeit only when necessary to a) achieve the asymptotically optimal algorithm or b) mitigate an observed bottleneck.
3129

3230
## License
33-
Licensed under Apache License, Version 2.0, ([LICENSE.txt](LICENSE.txt) or http://www.apache.org/licenses/LICENSE-2.0).
31+
Licensed under either of
3432

35-
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be licensed as above, without any additional terms or conditions.
33+
* Apache License, Version 2.0, ([LICENSE-APACHE.txt](LICENSE-APACHE.txt) or http://www.apache.org/licenses/LICENSE-2.0)
34+
* MIT license ([LICENSE-MIT.txt](LICENSE-MIT.txt) or http://opensource.org/licenses/MIT)
35+
36+
at your option.
37+
38+
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.

0 commit comments

Comments
 (0)