Skip to content

Commit 1380d84

Browse files
authored
fix: bump tangram client and fix compile failures (#180)
1 parent 4a8d2c6 commit 1380d84

File tree

12 files changed

+99
-66
lines changed

12 files changed

+99
-66
lines changed

packages/rust/tgrustc/Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/rust/tgrustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ futures = "0.3"
1919
itertools = "0.14"
2020
serde = { version = "1", features = ["derive"] }
2121
serde_json = "1"
22-
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
22+
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
2323
tokio = { version = "1", default-features = false, features = [
2424
"rt",
2525
"fs",

packages/rust/tgrustc/src/main.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -320,22 +320,12 @@ async fn run_proxy(args: Args) -> tg::Result<()> {
320320
let host = host().to_string();
321321
let run_arg = tg::run::Arg {
322322
args: command_args,
323-
cwd: None,
324-
cached: None,
325-
checksum: None,
326323
env,
327324
executable,
328325
host: Some(host),
329-
mounts: None,
330-
name: None,
326+
name: Some("rustc".into()),
331327
network: Some(false),
332-
parent: None,
333-
remote: None,
334-
retry: false,
335-
stderr: None,
336-
stdout: None,
337-
stdin: None,
338-
user: None,
328+
..Default::default()
339329
};
340330

341331
// Get the process output.

packages/std/Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/std/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ itertools = "0.14"
3535
libc = "0.2"
3636
serde = { version = "1", features = ["derive"] }
3737
serde_json = "1"
38-
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
39-
tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
38+
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
39+
tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
4040
tempfile = "3"
4141
tokio = { version = "1", default-features = false, features = [
4242
"rt",

packages/std/packages/std/manifest.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ impl Manifest {
474474

475475
/// Collect the dependencies from a manifest.
476476
#[must_use]
477-
pub fn dependencies(&self) -> BTreeMap<tg::Reference, tg::Referent<tg::Object>> {
477+
pub fn dependencies(&self) -> BTreeMap<tg::Reference, Option<tg::Referent<tg::Object>>> {
478478
let mut dependencies = BTreeMap::default();
479479

480480
// Collect the references from the interpreter.
@@ -550,6 +550,9 @@ impl Manifest {
550550
}
551551

552552
dependencies
553+
.into_iter()
554+
.map(|(reference, referent)| (reference, Some(referent)))
555+
.collect()
553556
}
554557
}
555558

packages/std/packages/tgcc/src/main.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -360,22 +360,12 @@ async fn run_proxy(environment: Environment, args: Args) -> tg::Result<()> {
360360
let host = tg::host().to_string();
361361
let run_arg = tg::run::Arg {
362362
args,
363-
cached: None,
364-
checksum: None,
365-
cwd: None,
366363
env: environment.env,
367364
executable,
368365
host: Some(host),
369-
name: None,
366+
name: Some("cc".into()),
370367
network: Some(false),
371-
mounts: None,
372-
parent: None,
373-
remote: None,
374-
retry: false,
375-
stdout: None,
376-
stderr: None,
377-
stdin: None,
378-
user: None,
368+
..Default::default()
379369
};
380370
let build_directory = tg::run::run(tg, run_arg)
381371
.await?
@@ -580,6 +570,7 @@ async fn check_in_source_tree(
580570
local_dependencies: true,
581571
locked: false,
582572
lock: false,
573+
..tg::checkin::Options::default()
583574
},
584575
path,
585576
updates: vec![],

0 commit comments

Comments
 (0)