Skip to content

Commit

Permalink
Auto merge of #41411 - frewsxcv:rollup, r=frewsxcv
Browse files Browse the repository at this point in the history
Rollup of 7 pull requests

- Successful merges: #41295, #41348, #41374, #41380, #41391, #41398, #41403
- Failed merges: #41376
  • Loading branch information
bors committed Apr 20, 2017
2 parents 452bf08 + 1c69895 commit 1bb1530
Show file tree
Hide file tree
Showing 249 changed files with 590 additions and 446 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,6 @@ before_cache:
grep -v missing |
xargs docker save |
gzip > $HOME/docker/rust-ci.tar.gz
- if [ ! -f $HOME/rustsrc/cache_valid1 ]; then
echo "WARNING rustsrc cache was invalid when saving";
rm -rf $HOME/rustsrc && mkdir $HOME/rustsrc;
fi
before_install:
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
- mkdir -p $HOME/rustsrc
Expand All @@ -206,7 +202,6 @@ notifications:
cache:
directories:
- $HOME/docker
- $HOME/rustsrc

before_deploy:
- mkdir -p deploy/$TRAVIS_COMMIT
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ The Rust community congregates in a few places:
* [users.rust-lang.org] - General discussion and broader questions.
* [/r/rust] - News and general discussion.

[Stack Overflow]: http://stackoverflow.com/questions/tagged/rust
[/r/rust]: http://reddit.com/r/rust
[Stack Overflow]: https://stackoverflow.com/questions/tagged/rust
[/r/rust]: https://reddit.com/r/rust
[users.rust-lang.org]: https://users.rust-lang.org/

## Contributing
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ on_failure:
- cat %CD%\sccache.log || exit 0

cache:
- C:\cache\rustsrc
- "build/i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
- "build/x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
- "i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
Expand Down
9 changes: 3 additions & 6 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions src/bootstrap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ This is an in-progress README which is targeted at helping to explain how Rust
is bootstrapped and in general some of the technical details of the build
system.

> **Note**: This build system is currently under active development and is not
> intended to be the primarily used one just yet. The makefiles are currently
> the ones that are still "guaranteed to work" as much as possible at least.
## Using rustbuild

The rustbuild build system has a primary entry point, a top level `x.py` script:
Expand Down
2 changes: 1 addition & 1 deletion src/doc/guide-plugins.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
% The (old) Rust Compiler Plugins Guide

This content has moved into
[the Unstable Book](unstable-book/plugin.html).
[the Unstable Book](unstable-book/language-features/plugin.html).
2 changes: 1 addition & 1 deletion src/doc/reference
Loading

0 comments on commit 1bb1530

Please sign in to comment.