Skip to content

Commit

Permalink
Fix sources::registry::parse_registry_dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
tomaka committed Oct 28, 2014
1 parent f16291d commit 63a3410
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/cargo/sources/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,11 @@ impl<'a, 'b> RegistrySource<'a, 'b> {

let dep = try!(Dependency::parse(name.as_slice(), Some(req.as_slice()),
&self.source_id));
drop(target); // FIXME: pass this in

Ok(dep.optional(optional)
.default_features(default_features)
.features(features))
.features(features)
.only_for_platform(target))
}

/// Actually perform network operations to update the registry
Expand Down

5 comments on commit 63a3410

@bors
Copy link
Contributor

@bors bors commented on 63a3410 Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at tomaka@63a3410

@bors
Copy link
Contributor

@bors bors commented on 63a3410 Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging tomaka/cargo/platform-specific-deps = 63a3410 into auto-cargo

@bors
Copy link
Contributor

@bors bors commented on 63a3410 Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tomaka/cargo/platform-specific-deps = 63a3410 merged ok, testing candidate = 7e78341

@bors
Copy link
Contributor

@bors bors commented on 63a3410 Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 63a3410 Oct 30, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto-cargo = 7e78341

Please sign in to comment.