Skip to content

Commit ca4b4dc

Browse files
committed
---
yaml --- r: 144911 b: refs/heads/try2 c: ed4859e h: refs/heads/master i: 144909: 2b0f741 144907: 35eef4a 144903: af8ec34 144895: 3ee7951 v: v3
1 parent 8ba2e4f commit ca4b4dc

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
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: 02a0fb94ee685381b08d138454052b062c8b4f6e
8+
refs/heads/try2: ed4859ea78581a6d5dd8b5f1636c5ac121588179
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/workcache.rs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ impl Context {
296296
}
297297

298298
pub fn new_with_freshness(db: RWArc<Database>,
299-
lg: RWArc<Logger>,
300-
cfg: Arc<json::Object>,
301-
freshness: Arc<FreshnessMap>) -> Context {
299+
lg: RWArc<Logger>,
300+
cfg: Arc<json::Object>,
301+
freshness: Arc<FreshnessMap>) -> Context {
302302
Context {
303303
db: db,
304304
logger: lg,
@@ -319,16 +319,18 @@ impl Context {
319319
}
320320

321321
impl Exec {
322-
pub fn discover_input(&mut self, dependency_kind:&str,
323-
// Discovered input
324-
dependency_name: &str, dependency_val: &str) {
322+
pub fn discover_input(&mut self,
323+
dependency_kind: &str,
324+
dependency_name: &str,
325+
dependency_val: &str) {
325326
debug!("Discovering input %s %s %s", dependency_kind, dependency_name, dependency_val);
326327
self.discovered_inputs.insert_work_key(WorkKey::new(dependency_kind, dependency_name),
327328
dependency_val.to_owned());
328329
}
329-
pub fn discover_output(&mut self, dependency_kind:&str,
330-
// Discovered output
331-
dependency_name: &str, dependency_val: &str) {
330+
pub fn discover_output(&mut self,
331+
dependency_kind: &str,
332+
dependency_name: &str,
333+
dependency_val: &str) {
332334
debug!("Discovering output %s %s %s", dependency_kind, dependency_name, dependency_val);
333335
self.discovered_outputs.insert_work_key(WorkKey::new(dependency_kind, dependency_name),
334336
dependency_val.to_owned());
@@ -340,11 +342,10 @@ impl Exec {
340342
for (k, v) in self.discovered_inputs.iter() {
341343
for (k1, _) in v.iter() {
342344
rs.push((k1.clone(), k.clone()));
343-
}
345+
}
344346
}
345347
rs
346348
}
347-
348349
}
349350

350351
impl<'self> Prep<'self> {
@@ -368,7 +369,7 @@ impl<'self> Prep<'self> {
368369
}
369370

370371
impl<'self> Prep<'self> {
371-
pub fn declare_input(&mut self, kind:&str, name:&str, val:&str) {
372+
pub fn declare_input(&mut self, kind: &str, name: &str, val: &str) {
372373
debug!("Declaring input %s %s %s", kind, name, val);
373374
self.declared_inputs.insert_work_key(WorkKey::new(kind, name),
374375
val.to_owned());

0 commit comments

Comments
 (0)