Skip to content

Commit

Permalink
Merge #543
Browse files Browse the repository at this point in the history
543: Update some links and some spelling/capitalization fixes r=jswrenn a=atouchet



Co-authored-by: Alex Touchet <alextouchet@outlook.com>
  • Loading branch information
bors[bot] and atouchet committed Jun 9, 2021
2 parents eedea19 + 9cfca9d commit a33134e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions CHANGELOG.md
Expand Up @@ -192,7 +192,7 @@
## 0.5.1
- Workaround module/function name clash that made racer crash on completing itertools. Only internal changes needed.
## 0.5.0
- [Release announcement](http://bluss.github.io/rust/2016/09/26/itertools-0.5.0/)
- [Release announcement](https://bluss.github.io/rust/2016/09/26/itertools-0.5.0/)
- Renamed:
- `combinations` is now `tuple_combinations`
- `combinations_n` to `combinations`
Expand Down Expand Up @@ -246,7 +246,7 @@
## 0.4.15
- Fixup on top of the workaround in 0.4.14. A function in `itertools::free` was removed by mistake and now it is added back again.
## 0.4.14
- Workaround an upstream regression in a rust nightly build that broke compilation of of `itertools::free::{interleave, merge}`
- Workaround an upstream regression in a Rust nightly build that broke compilation of of `itertools::free::{interleave, merge}`
## 0.4.13
- Add `.minmax()` and `.minmax_by_key()`, iterator methods for finding both minimum and maximum in one scan.
- Add `.format_default()`, a simpler version of `.format()` (lazy formatting for iterators).
Expand Down Expand Up @@ -312,9 +312,9 @@
## 0.3.19
- Added `.group_by_lazy()`, a possibly nonallocating group by
- Added `.format()`, a nonallocating formatting helper for iterators
- Remove uses of `RandomAccessIterator` since it has been deprecated in rust.
- Remove uses of `RandomAccessIterator` since it has been deprecated in Rust.
## 0.3.17
- Added (adopted) `Unfold` from rust
- Added (adopted) `Unfold` from Rust
## 0.3.16
- Added adaptors `.unique()`, `.unique_by()`
## 0.3.15
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Expand Up @@ -3,7 +3,7 @@ name = "itertools"
version = "0.10.0"

license = "MIT/Apache-2.0"
repository = "https://github.com/bluss/rust-itertools"
repository = "https://github.com/rust-itertools/itertools"
documentation = "https://docs.rs/itertools/"
authors = ["bluss"]

Expand All @@ -27,8 +27,8 @@ either = { version = "1.0", default-features = false }

[dev-dependencies]
rand = "0.7"
criterion = "=0" # TODO how could this work with our minimum supported rust version?
paste = "1.0.0" # Used in test_std to instanciate generic tests
criterion = "=0" # TODO how could this work with our minimum supported Rust version?
paste = "1.0.0" # Used in test_std to instantiate generic tests

[dev-dependencies.quickcheck]
version = "0.9"
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Expand Up @@ -13,7 +13,7 @@ __ https://docs.rs/itertools/
.. |build_status| image:: https://travis-ci.org/rust-itertools/itertools.svg?branch=master
.. _build_status: https://travis-ci.org/rust-itertools/itertools

.. |crates| image:: http://meritbadge.herokuapp.com/itertools
.. |crates| image:: https://meritbadge.herokuapp.com/itertools
.. _crates: https://crates.io/crates/itertools

How to use with cargo:
Expand All @@ -36,7 +36,7 @@ How to contribute
- Include tests for your new feature, preferably a quickcheck test
- Make a Pull Request

For new features, please first consider filing a PR to `rust-lang/rust <https://github.com/rust-lang/rust/>`_,
For new features, please first consider filing a PR to `rust-lang/rust <https://github.com/rust-lang/rust>`_,
adding your new feature to the `Iterator` trait of the standard library, if you believe it is reasonable.
If it isn't accepted there, proposing it for inclusion in ``itertools`` is a good idea.
The reason for doing is this is so that we avoid future breakage as with ``.flatten()``.
Expand All @@ -49,7 +49,7 @@ License
Dual-licensed to be compatible with the Rust project.

Licensed under the Apache License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
http://opensource.org/licenses/MIT, at your
https://www.apache.org/licenses/LICENSE-2.0 or the MIT license
https://opensource.org/licenses/MIT, at your
option. This file may not be copied, modified, or distributed
except according to those terms.
4 changes: 2 additions & 2 deletions src/adaptors/mod.rs
@@ -1,6 +1,6 @@
//! Licensed under the Apache License, Version 2.0
//! <http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
//! <http://opensource.org/licenses/MIT>, at your
//! <https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
//! <https://opensource.org/licenses/MIT>, at your
//! option. This file may not be copied, modified, or distributed
//! except according to those terms.

Expand Down
4 changes: 2 additions & 2 deletions tests/test_core.rs
@@ -1,6 +1,6 @@
//! Licensed under the Apache License, Version 2.0
//! http://www.apache.org/licenses/LICENSE-2.0 or the MIT license
//! http://opensource.org/licenses/MIT, at your
//! https://www.apache.org/licenses/LICENSE-2.0 or the MIT license
//! https://opensource.org/licenses/MIT, at your
//! option. This file may not be copied, modified, or distributed
//! except according to those terms.
#![no_std]
Expand Down

0 comments on commit a33134e

Please sign in to comment.