Skip to content

Commit 9da5d99

Browse files
author
Stjepan Glavina
committed
Use ordermap from crates.io
1 parent 0f01c3b commit 9da5d99

File tree

17 files changed

+14
-1997
lines changed

17 files changed

+14
-1997
lines changed

src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rustc_errors = { path = "../librustc_errors" }
2323
serialize = { path = "../libserialize" }
2424
syntax = { path = "../libsyntax" }
2525
syntax_pos = { path = "../libsyntax_pos" }
26-
ordermap = { path = "../ordermap" }
26+
ordermap = "0.3.0"
2727

2828
# Note that these dependencies are a lie, they're just here to get linkage to
2929
# work.

src/librustc/ty/context.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use std::borrow::Borrow;
6262
use std::cell::{Cell, RefCell};
6363
use std::cmp::Ordering;
6464
use ordermap::{self, Entry};
65-
use std::hash::{Hash, Hasher};
65+
use std::hash::{BuildHasherDefault, Hash, Hasher};
6666
use std::mem;
6767
use std::ops::Deref;
6868
use std::iter;
@@ -300,7 +300,10 @@ impl<'a, V> LocalTableInContextMut<'a, V> {
300300
self.data.get_mut(&id.local_id)
301301
}
302302

303-
pub fn entry(&mut self, id: hir::HirId) -> Entry<hir::ItemLocalId, V, ::std::hash::BuildHasherDefault<rustc_data_structures::fx::FxHasher>> {
303+
pub fn entry(
304+
&mut self,
305+
id: hir::HirId
306+
) -> Entry<hir::ItemLocalId, V, BuildHasherDefault<rustc_data_structures::fx::FxHasher>> {
304307
validate_hir_id_for_typeck_tables(self.local_id_root, id, true);
305308
self.data.entry(id.local_id)
306309
}

src/librustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ crate-type = ["dylib"]
1111
[dependencies]
1212
log = "0.3"
1313
serialize = { path = "../libserialize" }
14-
ordermap = { path = "../ordermap" }
14+
ordermap = "0.3.0"

src/librustc_lint/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ rustc_back = { path = "../librustc_back" }
1616
rustc_const_eval = { path = "../librustc_const_eval" }
1717
syntax = { path = "../libsyntax" }
1818
syntax_pos = { path = "../libsyntax_pos" }
19-
ordermap = { path = "../ordermap" }
19+
ordermap = "0.3.0"

src/librustc_metadata/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ serialize = { path = "../libserialize" }
2121
syntax = { path = "../libsyntax" }
2222
syntax_ext = { path = "../libsyntax_ext" }
2323
syntax_pos = { path = "../libsyntax_pos" }
24-
ordermap = { path = "../ordermap" }
24+
ordermap = "0.3.0"

src/librustc_mir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ rustc_errors = { path = "../librustc_errors" }
2020
serialize = { path = "../libserialize" }
2121
syntax = { path = "../libsyntax" }
2222
syntax_pos = { path = "../libsyntax_pos" }
23-
ordermap = { path = "../ordermap" }
23+
ordermap = "0.3.0"

src/librustc_passes/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ rustc_const_math = { path = "../librustc_const_math" }
1616
syntax = { path = "../libsyntax" }
1717
syntax_pos = { path = "../libsyntax_pos" }
1818
rustc_errors = { path = "../librustc_errors" }
19-
ordermap = { path = "../ordermap" }
19+
ordermap = "0.3.0"

src/librustc_trans/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustc_trans_utils = { path = "../librustc_trans_utils" }
3030
serialize = { path = "../libserialize" }
3131
syntax = { path = "../libsyntax" }
3232
syntax_pos = { path = "../libsyntax_pos" }
33-
ordermap = { path = "../ordermap" }
33+
ordermap = "0.3.0"
3434

3535
[target."cfg(windows)".dependencies]
3636
cc = "1.0"

src/librustc_typeck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ rustc_data_structures = { path = "../librustc_data_structures" }
2121
rustc_platform_intrinsics = { path = "../librustc_platform_intrinsics" }
2222
syntax_pos = { path = "../libsyntax_pos" }
2323
rustc_errors = { path = "../librustc_errors" }
24-
ordermap = { path = "../ordermap" }
24+
ordermap = "0.3.0"

src/libserialize/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ path = "lib.rs"
99
crate-type = ["dylib", "rlib"]
1010

1111
[dependencies]
12-
ordermap = { path = "../ordermap" }
12+
ordermap = "0.3.0"

src/ordermap/Cargo.toml

-8
This file was deleted.

src/ordermap/equivalent.rs

-27
This file was deleted.

0 commit comments

Comments
 (0)