syntax: Keep token span as a part of `Token` #61541

petrochenkov · 2019-06-05T11:43:27Z

In the world with proc macros and edition hygiene Token without a span is not self-contained.
In practice this means that tokens and spans are always stored and passed somewhere along with each other.
This PR combines them into a single struct by doing the next renaming/replacement:

Token -> TokenKind
TokenAndSpan -> Token
(Token, Span) -> Token

Some later commits (fb6e2fe and 1cdee86) remove duplicate spans in token::Ident and token::Lifetime.
Those spans were supposed to be identical to token spans, but could easily go out of sync, as was noticed in #60965 (comment).
The (Token, Span) -> Token change is a soft pre-requisite for this de-duplication since it allows to avoid some larger churn (passing spans to most of functions classifying identifiers).

src/librustdoc/html/highlight.rs

src/libsyntax/parse/lexer/mod.rs

src/libsyntax/ext/tt/macro_rules.rs

src/libsyntax/parse/literal.rs

src/libsyntax/parse/parser.rs

src/libsyntax/parse/token.rs

src/libsyntax/mut_visit.rs

oli-obk · 2019-06-06T06:29:35Z

r=me with visit_ident fixed and a comment on prev_span

bors · 2019-06-06T06:46:38Z

☔ The latest upstream changes (presumably #57428) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2019-06-06T16:14:24Z

⌛ Testing commit 3a31f06 with merge 03d5df4e519af16adb22146dbccabfda5f4db633...

bors · 2019-06-06T16:22:08Z

💔 Test failed - checks-travis

rust-highfive · 2019-06-06T16:22:09Z

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[00:03:47]    Compiling bstr v0.1.4
[00:03:48]    Compiling quote v0.6.12
[00:03:49]    Compiling clap v2.33.0
[00:03:49]    Compiling tar v0.4.26
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/std.rs:55:6
[00:03:50]    |
[00:03:50] 55 | impl SeedableRng for StdRng {
[00:03:50]    |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::IsaacRng: rand_core::SeedableRng` is not satisfied
[00:03:50]    |
[00:03:50]    |
[00:03:50] 50 | impl SeedableRng for IsaacRng {
[00:03:50]    |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::IsaacRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::Isaac64Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]    |
[00:03:50]    |
[00:03:50] 96 | impl SeedableRng for Isaac64Rng {
[00:03:50]    |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::Isaac64Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 198 | impl SeedableRng for Hc128Rng {
[00:03:50]     |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_xorshift::XorShiftRng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 239 | impl SeedableRng for XorShiftRng {
[00:03:50]     |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_xorshift::XorShiftRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 279 | impl SeedableRng for StdRng {
[00:03:50]     |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::block::BlockRngCore` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:73:5
[00:03:50]    |
[00:03:50] 73 |     rng: *mut ReseedingRng<Hc128Core, EntropyRng>,
[00:03:50]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::block::BlockRngCore` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:73:5
[00:03:50]    |
[00:03:50] 73 |     rng: *mut ReseedingRng<Hc128Core, EntropyRng>,
[00:03:50]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::block::BlockRngCore` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::block::BlockRngCore` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::block::BlockRngCore` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::block::BlockRngCore` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::block::BlockRngCore` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::block::BlockRngCore` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::block::BlockRngCore` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::block::BlockRngCore` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Core: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/thread.rs:76:1
[00:03:50] 76 | / thread_local!(
[00:03:50] 76 | / thread_local!(
[00:03:50] 77 | |     static THREAD_RNG_KEY: UnsafeCell<ReseedingRng<Hc128Core, EntropyRng>> = {
[00:03:50] 78 | |         let mut entropy_source = EntropyRng::new();
[00:03:50] 79 | |         let r = Hc128Core::from_rng(&mut entropy_source).unwrap_or_else(|err|
[00:03:50] 85 | |     }
[00:03:50] 86 | | );
[00:03:50] 86 | | );
[00:03:50]    | |__^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Core`
[00:03:50]    |
[00:03:50] note: required by `rngs::adapter::reseeding::ReseedingRng`
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/adapter/reseeding.rs:88:1
[00:03:50]    |
[00:03:50] 88 | / pub struct ReseedingRng<R, Rsdr>(BlockRng<ReseedingCore<R, Rsdr>>)
[00:03:50] 89 | | where R: BlockRngCore + SeedableRng,
[00:03:50] 90 | |       Rsdr: RngCore;
[00:03:50]    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
[00:03:50] 
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/std.rs:56:5
[00:03:50]    |
[00:03:50] 56 |     type Seed = <Hc128Rng as SeedableRng>::Seed;
[00:03:50]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]   --> /cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand-0.6.5/src/rngs/std.rs:58:5
[00:03:50]    |
[00:03:50] 58 | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 59 | |         StdRng(Hc128Rng::from_seed(seed))
[00:03:50] 60 | |     }
[00:03:50]    | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::IsaacRng: rand_core::SeedableRng` is not satisfied
[00:03:50]    |
[00:03:50]    |
[00:03:50] 51 |     type Seed = <rand_isaac::IsaacRng as SeedableRng>::Seed;
[00:03:50]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::IsaacRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::IsaacRng: rand_core::SeedableRng` is not satisfied
[00:03:50]    |
[00:03:50]    |
[00:03:50] 53 | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 54 | |         IsaacRng(rand_isaac::IsaacRng::from_seed(seed))
[00:03:50] 55 | |     }
[00:03:50]    | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::IsaacRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::Isaac64Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]    |
[00:03:50]    |
[00:03:50] 97 |     type Seed = <rand_isaac::Isaac64Rng as SeedableRng>::Seed;
[00:03:50]    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::Isaac64Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_isaac::Isaac64Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 99  | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 100 | |         Isaac64Rng(rand_isaac::Isaac64Rng::from_seed(seed))
[00:03:50] 101 | |     }
[00:03:50]     | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_isaac::Isaac64Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 199 |     type Seed = <rand_hc::Hc128Rng as SeedableRng>::Seed;
[00:03:50]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 201 | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 202 | |         Hc128Rng(rand_hc::Hc128Rng::from_seed(seed))
[00:03:50] 203 | |     }
[00:03:50]     | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_xorshift::XorShiftRng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 240 |     type Seed = <::rand_xorshift::XorShiftRng as SeedableRng>::Seed;
[00:03:50]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_xorshift::XorShiftRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_xorshift::XorShiftRng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 242 | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 243 | |         XorShiftRng(::rand_xorshift::XorShiftRng::from_seed(seed))
[00:03:50] 244 | |     }
[00:03:50]     | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_xorshift::XorShiftRng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 280 |     type Seed = <rngs::StdRng as SeedableRng>::Seed;
[00:03:50]     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] 
[00:03:50] error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
[00:03:50]     |
[00:03:50]     |
[00:03:50] 282 | /     fn from_seed(seed: Self::Seed) -> Self {
[00:03:50] 283 | |         StdRng(rngs::StdRng::from_seed(seed))
[00:03:50] 284 | |     }
[00:03:50]     | |_____^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`
[00:03:50] error: aborting due to 28 previous errors
[00:03:50] 
[00:03:50] For more information about this error, try `rustc --explain E0277`.
[00:03:50] error: Could not compile `rand`.
[00:03:50] error: Could not compile `rand`.
[00:03:50] warning: build failed, waiting for other jobs to finish...
[00:03:57] error: failed to compile `cargo-vendor v0.1.22`, intermediate artifacts can be found at `/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools`
[00:03:57] Caused by:
[00:03:57]   build failed
[00:03:57] 
[00:03:57] 
[00:03:57] 
[00:03:57] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "install" "-j" "4" "--locked" "--color" "always" "--force" "--debug" "--vers" "0.1.22" "cargo-vendor"
[00:03:57] 
[00:03:57] 
[00:03:57] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:03:57] Build completed unsuccessfully in 0:00:44
---
travis_time:end:17d3e890:start=1559838006442776570,finish=1559838006448734402,duration=5957832
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1ece8eb4
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:02aff458
travis_time:start:02aff458
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0b477f4c
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

pietroalbini · 2019-06-06T17:10:17Z

The rand crate broke.
@bors retry

bors · 2019-06-07T06:52:18Z

⌛ Testing commit 3a31f06 with merge ca1bcfd...

syntax: Keep token span as a part of `Token` In the world with proc macros and edition hygiene `Token` without a span is not self-contained. In practice this means that tokens and spans are always stored and passed somewhere along with each other. This PR combines them into a single struct by doing the next renaming/replacement: - `Token` -> `TokenKind` - `TokenAndSpan` -> `Token` - `(Token, Span)` -> `Token` Some later commits (fb6e2fe and 1cdee86) remove duplicate spans in `token::Ident` and `token::Lifetime`. Those spans were supposed to be identical to token spans, but could easily go out of sync, as was noticed in #60965 (comment). The `(Token, Span)` -> `Token` change is a soft pre-requisite for this de-duplication since it allows to avoid some larger churn (passing spans to most of functions classifying identifiers).

bors · 2019-06-07T09:41:01Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing ca1bcfd to master...

@oli-obk

parser: Remove `Deref` impl from `Parser` Follow up to rust-lang#61541 You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess. Not sure. Probably still better than people using both and being confused about the definition point of `span`. r? @oli-obk @estebank

@oli-obk

parser: Remove `Deref` impl from `Parser` Follow up to rust-lang#61541 You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess. Not sure. Probably still better than people using both and being confused about the definition point of `span`. r? @oli-obk @estebank

@oli-obk

parser: Remove `Deref` impl from `Parser` Follow up to rust-lang#61541 You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess. Not sure. Probably still better than people using both and being confused about the definition point of `span`. r? @oli-obk @estebank

@oli-obk

parser: Remove `Deref` impl from `Parser` Follow up to rust-lang#61541 You have to write `self.token.span` instead of `self.span` in the parser now, which is not nice, but not too bad either, I guess. Not sure. Probably still better than people using both and being confused about the definition point of `span`. r? @oli-obk @estebank

@oli-obk

syntax: Remove `Deref` impl from `Token` Follow up to rust-lang#61541 r? @oli-obk

matklad · 2019-07-06T07:36:07Z

src/libsyntax/parse/token.rs

+    }
+}
+
+impl PartialEq<TokenKind> for Token {


This impl is technically "wrong": it's not symmetric, and, if we made it symmetric, it would not be transitive.

I've tried to remove it, but got a dozen of screen-fulls of errors :D So I guess it's better to leave it as is: seems harmless, even if surprising a bit.

rust-highfive assigned michaelwoerister Jun 5, 2019

This comment has been minimized.

Sign in to view

oli-obk assigned oli-obk and unassigned michaelwoerister Jun 5, 2019

petrochenkov force-pushed the tsp branch from fc85e16 to 508c7ef Compare June 5, 2019 13:13

This was referenced Jun 5, 2019

Use slice patterns in rustc #61542

Closed

macro_rules follow logic allocates uselessly in the happy path #61543

Closed

oli-obk requested changes Jun 5, 2019

View reviewed changes

petrochenkov force-pushed the tsp branch 2 times, most recently from c380fa5 to e79d91a Compare June 5, 2019 19:31

This comment has been minimized.

Sign in to view

petrochenkov force-pushed the tsp branch from e79d91a to 8baf60b Compare June 5, 2019 21:07

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 6, 2019

petrochenkov added 14 commits June 6, 2019 14:01

Always use token kinds through token module rather than Token type

eac3846

syntax: Rename Token into TokenKind

99b27d7

syntax: Rename TokenAndSpan into Token

a3425ed

syntax: Use Token in TokenTree::Token

e0127db

syntax: Use Token in StringReader and TokenTreesReader

c0c57ac

syntax: Use Token in Parser

aa6fba9

syntax: Add some helper methods to Token

5e69353

syntax: Remove duplicate span from token::Lifetime

4c5d773

syntax: Remove duplicate span from token::Ident

f745e5f

syntax: Use Token in some more places

350a34f

syntax: Switch function parameter order in TokenTree::token

67ce3f4

syntax: Use Token in visitors and fix a mut visitor test

738e145

Some code cleanup and tidy/test fixes

ff40e37

Address review comments

3a31f06

petrochenkov force-pushed the tsp branch from 8baf60b to 3a31f06 Compare June 6, 2019 11:10

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 6, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 6, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 6, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 7, 2019

bors merged commit 3a31f06 into rust-lang:master Jun 7, 2019

This was referenced Jun 7, 2019

Allow attributes in formal function parameters #60669

Merged

Support ? Kleene macro operator in 2015 #60932

Merged

Use Symbol, Span in libfmt_macros #61568

Merged

Special-case literals in parse_bottom_expr. #61612

Merged

petrochenkov mentioned this pull request Jun 7, 2019

parser: Remove Deref impl from Parser #61616

Merged

petrochenkov deleted the tsp branch June 8, 2019 15:47

petrochenkov mentioned this pull request Jun 8, 2019

syntax: Remove Deref impl from Token #61669

Merged

Centril added a commit to Centril/rust that referenced this pull request Jun 8, 2019

Rollup merge of rust-lang#61669 - petrochenkov:tokderef2, r=oli-obk

6b71fba

syntax: Remove `Deref` impl from `Token` Follow up to rust-lang#61541 r? @oli-obk

petrochenkov mentioned this pull request Jun 11, 2019

Separate unit tests #61739

Merged

matklad reviewed Jul 6, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

syntax: Keep token span as a part of `Token` #61541

syntax: Keep token span as a part of `Token` #61541

petrochenkov commented Jun 5, 2019

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jun 6, 2019

bors commented Jun 6, 2019

bors commented Jun 6, 2019

bors commented Jun 6, 2019

rust-highfive commented Jun 6, 2019

pietroalbini commented Jun 6, 2019

bors commented Jun 7, 2019

bors commented Jun 7, 2019

matklad Jul 6, 2019 •

edited

Loading

syntax: Keep token span as a part of Token #61541

syntax: Keep token span as a part of Token #61541

Conversation

petrochenkov commented Jun 5, 2019

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jun 6, 2019

bors commented Jun 6, 2019

bors commented Jun 6, 2019

bors commented Jun 6, 2019

rust-highfive commented Jun 6, 2019

pietroalbini commented Jun 6, 2019

bors commented Jun 7, 2019

bors commented Jun 7, 2019

matklad Jul 6, 2019 • edited Loading

Choose a reason for hiding this comment

syntax: Keep token span as a part of `Token` #61541

syntax: Keep token span as a part of `Token` #61541

matklad Jul 6, 2019 •

edited

Loading