mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-28 20:16:58 +03:00
Define the unavailable target just once and re-use it
The same unavailable target value is used in two different places. Abstracting it makes it easier to update it and recognise its purpose.
This commit is contained in:
@@ -120,6 +120,18 @@ struct Target {
|
||||
extensions: Option<Vec<Component>>,
|
||||
}
|
||||
|
||||
impl Target {
|
||||
fn unavailable() -> Target {
|
||||
Target {
|
||||
available: false,
|
||||
url: None,
|
||||
hash: None,
|
||||
components: None,
|
||||
extensions: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(RustcEncodable)]
|
||||
struct Component {
|
||||
pkg: String,
|
||||
@@ -242,13 +254,7 @@ fn build_manifest(&mut self) -> Manifest {
|
||||
let digest = match self.digests.remove(&filename) {
|
||||
Some(digest) => digest,
|
||||
None => {
|
||||
pkg.target.insert(host.to_string(), Target {
|
||||
available: false,
|
||||
url: None,
|
||||
hash: None,
|
||||
components: None,
|
||||
extensions: None,
|
||||
});
|
||||
pkg.target.insert(host.to_string(), Target::unavailable());
|
||||
continue
|
||||
}
|
||||
};
|
||||
@@ -312,15 +318,7 @@ fn package(&mut self,
|
||||
let filename = self.filename(pkgname, name);
|
||||
let digest = match self.digests.remove(&filename) {
|
||||
Some(digest) => digest,
|
||||
None => {
|
||||
return (name.to_string(), Target {
|
||||
available: false,
|
||||
url: None,
|
||||
hash: None,
|
||||
components: None,
|
||||
extensions: None,
|
||||
})
|
||||
}
|
||||
None => return (name.to_string(), Target::unavailable()),
|
||||
};
|
||||
|
||||
(name.to_string(), Target {
|
||||
|
||||
Reference in New Issue
Block a user