Skip to content

Commit 1c3f34d

Browse files
committed
Convert HashMap to BTree in build-manifest
1 parent 8493dd6 commit 1c3f34d

File tree

1 file changed

+8
-8
lines changed
  • src/tools/build-manifest/src

1 file changed

+8
-8
lines changed

src/tools/build-manifest/src/main.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
extern crate toml;
1212
extern crate rustc_serialize;
1313

14-
use std::collections::{BTreeMap, HashMap};
14+
use std::collections::BTreeMap;
1515
use std::env;
1616
use std::fs::File;
1717
use std::io::{self, Read, Write};
@@ -101,13 +101,13 @@ static MINGW: &'static [&'static str] = &[
101101
struct Manifest {
102102
manifest_version: String,
103103
date: String,
104-
pkg: HashMap<String, Package>,
104+
pkg: BTreeMap<String, Package>,
105105
}
106106

107107
#[derive(RustcEncodable)]
108108
struct Package {
109109
version: String,
110-
target: HashMap<String, Target>,
110+
target: BTreeMap<String, Target>,
111111
}
112112

113113
#[derive(RustcEncodable)]
@@ -138,7 +138,7 @@ struct Builder {
138138
input: PathBuf,
139139
output: PathBuf,
140140
gpg_passphrase: String,
141-
digests: HashMap<String, String>,
141+
digests: BTreeMap<String, String>,
142142
s3_address: String,
143143
date: String,
144144
rust_version: String,
@@ -162,7 +162,7 @@ fn main() {
162162
input: input,
163163
output: output,
164164
gpg_passphrase: passphrase,
165-
digests: HashMap::new(),
165+
digests: BTreeMap::new(),
166166
s3_address: s3_address,
167167
date: date,
168168
rust_version: String::new(),
@@ -214,7 +214,7 @@ impl Builder {
214214
let mut manifest = Manifest {
215215
manifest_version: "2".to_string(),
216216
date: self.date.to_string(),
217-
pkg: HashMap::new(),
217+
pkg: BTreeMap::new(),
218218
};
219219

220220
self.package("rustc", &mut manifest.pkg, HOSTS);
@@ -230,7 +230,7 @@ impl Builder {
230230

231231
let mut pkg = Package {
232232
version: self.cached_version("rust").to_string(),
233-
target: HashMap::new(),
233+
target: BTreeMap::new(),
234234
};
235235
for host in HOSTS {
236236
let filename = self.filename("rust", host);
@@ -299,7 +299,7 @@ impl Builder {
299299

300300
fn package(&mut self,
301301
pkgname: &str,
302-
dst: &mut HashMap<String, Package>,
302+
dst: &mut BTreeMap<String, Package>,
303303
targets: &[&str]) {
304304
let targets = targets.iter().map(|name| {
305305
let filename = self.filename(pkgname, name);

0 commit comments

Comments
 (0)