diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-11-06 07:03:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 07:03:08 +0100 |
| commit | 167b8fedd615becb4e614ae0635a0e488cce70c4 (patch) | |
| tree | 21d9dbb2693a5ea4f8fc08b7241021dd1e14b92c /src/libsyntax | |
| parent | 98cbe179032726052d672334bb1a82cd4f604072 (diff) | |
| parent | 90b8d34c9f0d17c948801f676a96800e8b038508 (diff) | |
| download | rust-167b8fedd615becb4e614ae0635a0e488cce70c4.tar.gz rust-167b8fedd615becb4e614ae0635a0e488cce70c4.zip | |
Rollup merge of #66086 - RalfJung:smallvec, r=nagisa
bump smallvec to 1.0 This includes https://github.com/servo/rust-smallvec/pull/162, fixing an unsoundness in smallvec. See https://github.com/servo/rust-smallvec/pull/175 for the 1.0 release announcement. Cc @mbrubeck @emilio
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libsyntax/tokenstream.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml index 3ce47e6a7b8..b1839cc05cd 100644 --- a/src/libsyntax/Cargo.toml +++ b/src/libsyntax/Cargo.toml @@ -21,4 +21,4 @@ rustc_data_structures = { path = "../librustc_data_structures" } rustc_index = { path = "../librustc_index" } rustc_lexer = { path = "../librustc_lexer" } rustc_target = { path = "../librustc_target" } -smallvec = { version = "0.6.7", features = ["union", "may_dangle"] } +smallvec = { version = "1.0", features = ["union", "may_dangle"] } diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs index 7e0582797c7..a51d208704a 100644 --- a/src/libsyntax/tokenstream.rs +++ b/src/libsyntax/tokenstream.rs @@ -243,7 +243,7 @@ impl TokenStream { // Get the first stream. If it's `None`, create an empty // stream. - let mut iter = streams.drain(); + let mut iter = streams.drain(..); let mut first_stream_lrc = iter.next().unwrap().0; // Append the elements to the first stream, after reserving |