Skip to content

Commit 2addd92

Browse files
committed
---
yaml --- r: 147657 b: refs/heads/try2 c: b9f0d9b h: refs/heads/master i: 147655: 23c2a4c v: v3
1 parent 3c8d7fe commit 2addd92

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4b53a2cdd8e567a40d93e9879617989c89080e5f
8+
refs/heads/try2: b9f0d9bdc193bb4d7923b0a033ab7e19b1419fc8
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/resolve.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ struct Module {
443443
anonymous_children: RefCell<HashMap<NodeId,@Module>>,
444444

445445
// The status of resolving each import in this module.
446-
import_resolutions: RefCell<HashMap<Name, @mut ImportResolution>>,
446+
import_resolutions: RefCell<HashMap<Name, @ImportResolution>>,
447447

448448
// The number of unresolved globs that this module exports.
449449
glob_count: Cell<uint>,
@@ -1978,7 +1978,7 @@ impl Resolver {
19781978
}
19791979
None => {
19801980
debug!("(building import directive) creating new");
1981-
let resolution = @mut ImportResolution::new(id, is_public);
1981+
let resolution = @ImportResolution::new(id, is_public);
19821982
resolution.outstanding_references.set(1);
19831983
import_resolutions.get().insert(target.name,
19841984
resolution);
@@ -2334,8 +2334,7 @@ impl Resolver {
23342334
== 0 => {
23352335

23362336
fn get_binding(this: &mut Resolver,
2337-
import_resolution:
2338-
@mut ImportResolution,
2337+
import_resolution: @ImportResolution,
23392338
namespace: Namespace)
23402339
-> NamespaceResult {
23412340

@@ -2534,7 +2533,7 @@ impl Resolver {
25342533
None => {
25352534
// Simple: just copy the old import resolution.
25362535
let new_import_resolution =
2537-
@mut ImportResolution::new(id, is_public);
2536+
@ImportResolution::new(id, is_public);
25382537
new_import_resolution.value_target.set(
25392538
target_import_resolution.value_target.get());
25402539
new_import_resolution.type_target.set(
@@ -2577,8 +2576,8 @@ impl Resolver {
25772576
match import_resolutions.get().find(&name) {
25782577
None => {
25792578
// Create a new import resolution from this child.
2580-
dest_import_resolution = @mut ImportResolution::new(id,
2581-
is_public);
2579+
dest_import_resolution =
2580+
@ImportResolution::new(id, is_public);
25822581
import_resolutions.get().insert(name,
25832582
dest_import_resolution);
25842583
}

0 commit comments

Comments
 (0)