Skip to content

Commit 1bb1530

Browse files
committed
Auto merge of #41411 - frewsxcv:rollup, r=frewsxcv
Rollup of 7 pull requests - Successful merges: #41295, #41348, #41374, #41380, #41391, #41398, #41403 - Failed merges: #41376
2 parents 452bf08 + 1c69895 commit 1bb1530

File tree

249 files changed

+590
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+590
-446
lines changed

.travis.yml

-5
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,6 @@ before_cache:
192192
grep -v missing |
193193
xargs docker save |
194194
gzip > $HOME/docker/rust-ci.tar.gz
195-
- if [ ! -f $HOME/rustsrc/cache_valid1 ]; then
196-
echo "WARNING rustsrc cache was invalid when saving";
197-
rm -rf $HOME/rustsrc && mkdir $HOME/rustsrc;
198-
fi
199195
before_install:
200196
- zcat $HOME/docker/rust-ci.tar.gz | docker load || true
201197
- mkdir -p $HOME/rustsrc
@@ -206,7 +202,6 @@ notifications:
206202
cache:
207203
directories:
208204
- $HOME/docker
209-
- $HOME/rustsrc
210205

211206
before_deploy:
212207
- mkdir -p deploy/$TRAVIS_COMMIT

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ The Rust community congregates in a few places:
198198
* [users.rust-lang.org] - General discussion and broader questions.
199199
* [/r/rust] - News and general discussion.
200200

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

205205
## Contributing

appveyor.yml

-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ on_failure:
151151
- cat %CD%\sccache.log || exit 0
152152

153153
cache:
154-
- C:\cache\rustsrc
155154
- "build/i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
156155
- "build/x86_64-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"
157156
- "i686-pc-windows-msvc/llvm -> src/rustllvm/llvm-rebuild-trigger"

src/Cargo.lock

+3-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/README.md

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ This is an in-progress README which is targeted at helping to explain how Rust
44
is bootstrapped and in general some of the technical details of the build
55
system.
66

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

139
The rustbuild build system has a primary entry point, a top level `x.py` script:

src/doc/guide-plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
% The (old) Rust Compiler Plugins Guide
22

33
This content has moved into
4-
[the Unstable Book](unstable-book/plugin.html).
4+
[the Unstable Book](unstable-book/language-features/plugin.html).

src/doc/reference

0 commit comments

Comments
 (0)