Skip to content

Commit

Permalink
Merge #842
Browse files Browse the repository at this point in the history
842: Update links r=cuviper a=atouchet

Update some links and use HTTPS where available.

Co-authored-by: Alex Touchet <[email protected]>
  • Loading branch information
bors[bot] and atouchet authored Apr 1, 2021
2 parents 385840e + e20b4ed commit d5f9e31
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ tscounter.store(value + 1, Ordering::SeqCst);

You can already see that the `AtomicUsize` API is a bit more complex,
as it requires you to specify an
[ordering](http://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html). (I
[ordering](https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html). (I
won't go into the details on ordering here, but suffice to say that if
you don't know what an ordering is, and probably even if you do, you
should use `Ordering::SeqCst`.) The danger in this parallel version of
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Belt Rust conference.) Rayon is
[available on crates.io](https://crates.io/crates/rayon), and
[API Documentation is available on docs.rs](https://docs.rs/rayon/).

[blog]: http://smallcultfollowing.com/babysteps/blog/2015/12/18/rayon-data-parallelism-in-rust/
[blog]: https://smallcultfollowing.com/babysteps/blog/2015/12/18/rayon-data-parallelism-in-rust/
[video]: https://www.youtube.com/watch?v=gof_OEv71Aw

## Parallel iterators and more
Expand Down
6 changes: 3 additions & 3 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ Thanks to the following people for their contributions to this release:
This release includes a lot of progress towards the goal of parity
with the sequential iterator API, though there are still a few methods
that are not yet complete. If you'd like to help with that effort,
[check out the milestone](https://github.com/nikomatsakis/rayon/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Parity+with+the+%60Iterator%60+trait%22)
[check out the milestone](https://github.com/rayon-rs/rayon/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Parity+with+the+%60Iterator%60+trait%22)
to see the remaining issues.

**Announcement:** @cuviper has been added as a collaborator to the
Expand Down Expand Up @@ -672,7 +672,7 @@ API. Thanks @cuviper! Keep it up.
- We are considering removing weights or changing the weight mechanism
before 1.0. Examples of scenarios where you still need weights even
with this adaptive mechanism would be great. Join the discussion
at <https://github.com/nikomatsakis/rayon/issues/111>.
at <https://github.com/rayon-rs/rayon/issues/111>.
- New (unstable) scoped threads API, see `rayon::scope` for details.
- You will need to supply the [cargo feature] `unstable`.
- The various demos and benchmarks have been consolidated into one
Expand All @@ -682,7 +682,7 @@ API. Thanks @cuviper! Keep it up.
- Various internal cleanup in the implementation and typo fixes.
Thanks @cuviper, @Eh2406, and @spacejam!

[cargo feature]: http://doc.crates.io/manifest.html#the-features-section
[cargo feature]: https://doc.rust-lang.org/cargo/reference/features.html#the-features-section


# Release 0.4.2 (2016-09-15)
Expand Down
2 changes: 1 addition & 1 deletion rayon-demo/data/tsp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ format.
Sources:

- `dj15.tsp`: derived from `dj38.tsp`
- `dj38.tsp`: <http://www.math.uwaterloo.ca/tsp/world/dj38.tsp>
- `dj38.tsp`: <https://www.math.uwaterloo.ca/tsp/world/dj38.tsp>

2 changes: 1 addition & 1 deletion rayon-demo/src/tsp/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use super::weight::Weight;

// Parses "TSPLIB" files from sources like
//
// http://www.math.uwaterloo.ca/tsp/world/dj38.tsp
// https://www.math.uwaterloo.ca/tsp/world/dj38.tsp
//
// The format looks roughly like this, at least for EUC_2D cases:
//
Expand Down
2 changes: 1 addition & 1 deletion src/iter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
//! If you'd like to build a custom parallel iterator, or to write your own
//! combinator, then check out the [split] function and the [plumbing] module.
//!
//! [regular iterator]: http://doc.rust-lang.org/std/iter/trait.Iterator.html
//! [regular iterator]: https://doc.rust-lang.org/std/iter/trait.Iterator.html
//! [`ParallelIterator`]: trait.ParallelIterator.html
//! [`IndexedParallelIterator`]: trait.IndexedParallelIterator.html
//! [split]: fn.split.html
Expand Down
2 changes: 1 addition & 1 deletion src/slice/mergesort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ fn collapse(runs: &[Run]) -> Option<usize> {
/// Otherwise, it sorts the slice into non-descending order.
///
/// This merge sort borrows some (but not all) ideas from TimSort, which is described in detail
/// [here](http://svn.python.org/projects/python/trunk/Objects/listsort.txt).
/// [here](https://svn.python.org/projects/python/trunk/Objects/listsort.txt).
///
/// The algorithm identifies strictly descending and non-descending subsequences, which are called
/// natural runs. There is a stack of pending runs yet to be merged. Each newly found run is pushed
Expand Down
2 changes: 1 addition & 1 deletion src/slice/quicksort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ where
/// Partitioning is performed block-by-block in order to minimize the cost of branching operations.
/// This idea is presented in the [BlockQuicksort][pdf] paper.
///
/// [pdf]: http://drops.dagstuhl.de/opus/volltexte/2016/6389/pdf/LIPIcs-ESA-2016-38.pdf
/// [pdf]: https://drops.dagstuhl.de/opus/volltexte/2016/6389/pdf/LIPIcs-ESA-2016-38.pdf
fn partition_in_blocks<T, F>(v: &mut [T], pivot: &T, is_less: &F) -> usize
where
F: Fn(&T, &T) -> bool,
Expand Down

0 comments on commit d5f9e31

Please sign in to comment.