Skip to content

Commit 537ccdf

Browse files
committedApr 2, 2020
Auto merge of rust-lang#70692 - Centril:rollup-d0t4ecx, r=Centril
Rollup of 8 pull requests Successful merges: - rust-lang#70281 (Implement Hash for Infallible) - rust-lang#70421 (parse: recover on `const fn()` / `async fn()`) - rust-lang#70615 (Renamed `PerDefTables` to `Tables`) - rust-lang#70631 (Update cargo) - rust-lang#70634 (Remove some reexports in `rustc_middle`) - rust-lang#70658 (add `STILL_FURTHER_SPECIALIZABLE` flag) - rust-lang#70678 (Add missing markdown rust annotation) - rust-lang#70681 (Handle unterminated raw strings with no #s properly) Failed merges: r? @ghost
2 parents 0f72ce1 + ec0da72 commit 537ccdf

File tree

151 files changed

+892
-669
lines changed

Some content is hidden

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

151 files changed

+892
-669
lines changed
 

‎src/doc/unstable-book/src/language-features/generators.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Feedback on the design and usage is always appreciated!
8787

8888
The `Generator` trait in `std::ops` currently looks like:
8989

90-
```
90+
```rust
9191
# #![feature(arbitrary_self_types, generator_trait)]
9292
# use std::ops::GeneratorState;
9393
# use std::pin::Pin;
@@ -107,7 +107,7 @@ point for executing the `Generator` itself.
107107

108108
The return value of `resume`, `GeneratorState`, looks like:
109109

110-
```
110+
```rust
111111
pub enum GeneratorState<Y, R> {
112112
Yielded(Y),
113113
Complete(R),

‎src/libcore/convert/mod.rs

+8
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#![stable(feature = "rust1", since = "1.0.0")]
4242

4343
use crate::fmt;
44+
use crate::hash::{Hash, Hasher};
4445

4546
mod num;
4647

@@ -746,3 +747,10 @@ impl From<!> for Infallible {
746747
x
747748
}
748749
}
750+
751+
#[stable(feature = "convert_infallible_hash", since = "1.44.0")]
752+
impl Hash for Infallible {
753+
fn hash<H: Hasher>(&self, _: &mut H) {
754+
match *self {}
755+
}
756+
}

0 commit comments

Comments
 (0)