Skip to content

Commit 8bf7fda

Browse files
committed
Auto merge of #58189 - kennytm:rollup, r=kennytm
Rollup of 23 pull requests Successful merges: - #58001 (proc_macro: make `TokenStream::from_streams` pre-allocate its vector.) - #58096 (Transition linkchecker to 2018 edition) - #58097 (Transition remote test to Rust 2018) - #58106 (libfmt_macros => 2018) - #58107 (libgraphviz => 2018) - #58108 (Add NVPTX target to a build manifest) - #58109 (librustc_privacy => 2018) - #58112 (libpanic_abort => 2018) - #58113 (Transition build-manifest to 2018 edition) - #58114 (Transition tidy and unstable-book-gen to 2018 edition) - #58116 (Include the span of attributes of the lhs to the span of the assignment expression) - #58117 (Transition rustdoc-theme to 2018 edition) - #58128 (libunwind => 2018) - #58138 (Fix #58101) - #58139 (hir: add more HirId methods) - #58141 (Remove weasel word in docs for iter's take_while()) - #58142 (Remove stray FIXME) - #58145 (Add #[must_use] to core::task::Poll) - #58162 (Add more debugging code to track down appveyor 259 exit code) - #58169 (Update contributor name in .mailmap) - #58172 (update split docs) - #58182 (SGX target: handle empty user buffers correctly) - #58186 (Add Rustlings to the doc index) Failed merges: r? @ghost
2 parents b2c6b8c + c23871a commit 8bf7fda

File tree

40 files changed

+188
-62
lines changed

40 files changed

+188
-62
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
155155
Matthew Auld <matthew.auld@intel.com>
156156
Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
157157
Matthijs Hofstra <thiezz@gmail.com>
158+
Melody Horn <melody@boringcactus.com> <mathphreak@gmail.com>
158159
Michael Williams <m.t.williams@live.com>
159160
Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
160161
Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com>

appveyor.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,10 @@ test_script:
207207
- sh src/ci/init_repo.sh . /c/cache/rustsrc
208208
- set SRC=.
209209
- set NO_CCACHE=1
210-
- sh src/ci/run.sh
210+
# Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160
211+
# Replace it with the commented line below after the issue with AppVeyor is fixed
212+
- "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%"
213+
# - sh src/ci/run.sh
211214

212215
on_failure:
213216
# Dump crash log

src/ci/run.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,13 @@ if [ ! -z "$SCRIPT" ]; then
127127
set +e
128128
sh -x -c "$SCRIPT"
129129
ret=$?
130-
echo "script exited with $ret"
130+
echo "exit code in src/ci/run.sh: $ret"
131+
132+
echo "tasklist:"
133+
tasklist
134+
echo -n "location of sh: "
135+
where sh
136+
131137
exit $ret
132138
else
133139
do_make() {

src/doc/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ If reading multiple hundreds of pages about a language isn't your style, then
5252
a lot of words, RBE shows off a bunch of code, and keeps the talking to a
5353
minimum. It also includes exercises!
5454

55+
## Rustlings
56+
57+
[Rustlings](https://github.com/rust-lang/rustlings) guides you through downloading and setting up the Rust toolchain,
58+
and teaches you the basics of reading and writing Rust syntax. It's an
59+
alternative to Rust by Example that works with your own environment.
60+
5561
# Use Rust
5662

5763
Once you've gotten familiar with the language, these resources can help you

src/libcore/iter/traits/iterator.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,8 +952,7 @@ pub trait Iterator {
952952
/// ```
953953
///
954954
/// The `3` is no longer there, because it was consumed in order to see if
955-
/// the iteration should stop, but wasn't placed back into the iterator or
956-
/// some similar thing.
955+
/// the iteration should stop, but wasn't placed back into the iterator.
957956
#[inline]
958957
#[stable(feature = "rust1", since = "1.0.0")]
959958
fn take_while<P>(self, predicate: P) -> TakeWhile<Self, P> where

src/libcore/str/mod.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2961,8 +2961,8 @@ impl str {
29612961
/// An iterator over substrings of this string slice, separated by
29622962
/// characters matched by a pattern.
29632963
///
2964-
/// The pattern can be a `&str`, [`char`], or a closure that determines the
2965-
/// split.
2964+
/// The pattern can be any type that implements the Pattern trait. Notable
2965+
/// examples are `&str`, [`char`], and closures that determines the split.
29662966
///
29672967
/// # Iterator behavior
29682968
///
@@ -3078,8 +3078,8 @@ impl str {
30783078
/// An iterator over substrings of the given string slice, separated by
30793079
/// characters matched by a pattern and yielded in reverse order.
30803080
///
3081-
/// The pattern can be a `&str`, [`char`], or a closure that determines the
3082-
/// split.
3081+
/// The pattern can be any type that implements the Pattern trait. Notable
3082+
/// examples are `&str`, [`char`], and closures that determines the split.
30833083
///
30843084
/// # Iterator behavior
30853085
///
@@ -3128,8 +3128,8 @@ impl str {
31283128
/// An iterator over substrings of the given string slice, separated by
31293129
/// characters matched by a pattern.
31303130
///
3131-
/// The pattern can be a `&str`, [`char`], or a closure that determines the
3132-
/// split.
3131+
/// The pattern can be any type that implements the Pattern trait. Notable
3132+
/// examples are `&str`, [`char`], and closures that determines the split.
31333133
///
31343134
/// Equivalent to [`split`], except that the trailing substring
31353135
/// is skipped if empty.
@@ -3175,8 +3175,8 @@ impl str {
31753175
/// An iterator over substrings of `self`, separated by characters
31763176
/// matched by a pattern and yielded in reverse order.
31773177
///
3178-
/// The pattern can be a simple `&str`, [`char`], or a closure that
3179-
/// determines the split.
3178+
/// The pattern can be any type that implements the Pattern trait. Notable
3179+
/// examples are `&str`, [`char`], and closures that determines the split.
31803180
/// Additional libraries might provide more complex patterns like
31813181
/// regular expressions.
31823182
///
@@ -3222,8 +3222,8 @@ impl str {
32223222
/// If `n` substrings are returned, the last substring (the `n`th substring)
32233223
/// will contain the remainder of the string.
32243224
///
3225-
/// The pattern can be a `&str`, [`char`], or a closure that determines the
3226-
/// split.
3225+
/// The pattern can be any type that implements the Pattern trait. Notable
3226+
/// examples are `&str`, [`char`], and closures that determines the split.
32273227
///
32283228
/// # Iterator behavior
32293229
///
@@ -3275,8 +3275,8 @@ impl str {
32753275
/// If `n` substrings are returned, the last substring (the `n`th substring)
32763276
/// will contain the remainder of the string.
32773277
///
3278-
/// The pattern can be a `&str`, [`char`], or a closure that
3279-
/// determines the split.
3278+
/// The pattern can be any type that implements the Pattern trait. Notable
3279+
/// examples are `&str`, [`char`], and closures that determines the split.
32803280
///
32813281
/// # Iterator behavior
32823282
///
@@ -3319,8 +3319,8 @@ impl str {
33193319
/// An iterator over the disjoint matches of a pattern within the given string
33203320
/// slice.
33213321
///
3322-
/// The pattern can be a `&str`, [`char`], or a closure that
3323-
/// determines if a character matches.
3322+
/// The pattern can be any type that implements the Pattern trait. Notable
3323+
/// examples are `&str`, [`char`], and closures that determines the split.
33243324
///
33253325
/// # Iterator behavior
33263326
///

src/libcore/task/poll.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use result::Result;
77

88
/// Indicates whether a value is available or if the current task has been
99
/// scheduled to receive a wakeup instead.
10+
#[must_use = "this `Poll` may be a `Pending` variant, which should be handled"]
1011
#[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
1112
pub enum Poll<T> {
1213
/// Represents that a value is immediately ready.

src/libfmt_macros/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "fmt_macros"
44
version = "0.0.0"
5+
edition = "2018"
56

67
[lib]
78
name = "fmt_macros"

src/libfmt_macros/lib.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
html_playground_url = "https://play.rust-lang.org/",
1111
test(attr(deny(warnings))))]
1212

13-
#![feature(nll)]
13+
#![deny(rust_2018_idioms)]
14+
1415
#![feature(rustc_private)]
1516

16-
pub use self::Piece::*;
17-
pub use self::Position::*;
18-
pub use self::Alignment::*;
19-
pub use self::Flag::*;
20-
pub use self::Count::*;
17+
pub use Piece::*;
18+
pub use Position::*;
19+
pub use Alignment::*;
20+
pub use Flag::*;
21+
pub use Count::*;
2122

2223
use std::str;
2324
use std::string;

src/libgraphviz/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "graphviz"
44
version = "0.0.0"
5+
edition = "2018"
56

67
[lib]
78
name = "graphviz"

0 commit comments

Comments
 (0)