bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

incr.comp.: Fix merge fallout.

Browse source
This commit is contained in:
Michael Woerister 2017-12-08 10:17:17 +01:00
parent f5bd1ca678
commit 539e171772
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/mir/mod.rs
View file

@ -1830,7 +1830,7 @@ pub struct GeneratorLayout<'tcx> {
/// instance of the closure is created, the corresponding free regions /// instance of the closure is created, the corresponding free regions
/// can be extracted from its type and constrained to have the given /// can be extracted from its type and constrained to have the given
/// outlives relationship. /// outlives relationship.
#[derive(Clone, Debug)] #[derive(Clone, Debug, RustcEncodable, RustcDecodable)]
pub struct ClosureRegionRequirements { pub struct ClosureRegionRequirements {
/// The number of external regions defined on the closure. In our /// The number of external regions defined on the closure. In our
/// example above, it would be 3 -- one for `'static`, then `'1` /// example above, it would be 3 -- one for `'static`, then `'1`
@ -1846,7 +1846,7 @@ pub struct ClosureRegionRequirements {
/// Indicates an outlives constraint between two free-regions declared /// Indicates an outlives constraint between two free-regions declared
/// on the closure. /// on the closure.
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable)]
pub struct ClosureOutlivesRequirement { pub struct ClosureOutlivesRequirement {
// This region ... // This region ...
pub free_region: ty::RegionVid, pub free_region: ty::RegionVid,