Skip to content

fix: bump tangram client and fix compile failures #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2025
Merged

fix: bump tangram client and fix compile failures #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35b5d20
fix: bump tangram client and fix compile failures
m-hilgendorf Oct 16, 2025
7cf4797
use default for run arg
deciduously Oct 16, 2025
98a999a
bump tgrustc
deciduously Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/rust/tgrustc/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/rust/tgrustc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ futures = "0.3"
itertools = "0.14"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
tokio = { version = "1", default-features = false, features = [
"rt",
"fs",
Expand Down
14 changes: 2 additions & 12 deletions packages/rust/tgrustc/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,12 @@ async fn run_proxy(args: Args) -> tg::Result<()> {
let host = host().to_string();
let run_arg = tg::run::Arg {
args: command_args,
cwd: None,
cached: None,
checksum: None,
env,
executable,
host: Some(host),
mounts: None,
name: None,
name: Some("rustc".into()),
network: Some(false),
parent: None,
remote: None,
retry: false,
stderr: None,
stdout: None,
stdin: None,
user: None,
..Default::default()
};

// Get the process output.
Expand Down
16 changes: 8 additions & 8 deletions packages/std/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ itertools = "0.14"
libc = "0.2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "6da4e0886a6b5a3000d1efbbaf6f2c3e90808fb0" }
tangram_client = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
tangram_serialize = { default-features = false, git = "https://github.com/tangramdotdev/tangram", rev = "672bf6735a72f91be57d31a1c1d0ea6c3a8a7a2e" }
tempfile = "3"
tokio = { version = "1", default-features = false, features = [
"rt",
Expand Down
5 changes: 4 additions & 1 deletion packages/std/packages/std/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ impl Manifest {

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

// Collect the references from the interpreter.
Expand Down Expand Up @@ -550,6 +550,9 @@ impl Manifest {
}

dependencies
.into_iter()
.map(|(reference, referent)| (reference, Some(referent)))
.collect()
}
}

Expand Down
15 changes: 3 additions & 12 deletions packages/std/packages/tgcc/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,22 +360,12 @@ async fn run_proxy(environment: Environment, args: Args) -> tg::Result<()> {
let host = tg::host().to_string();
let run_arg = tg::run::Arg {
args,
cached: None,
checksum: None,
cwd: None,
env: environment.env,
executable,
host: Some(host),
name: None,
name: Some("cc".into()),
network: Some(false),
mounts: None,
parent: None,
remote: None,
retry: false,
stdout: None,
stderr: None,
stdin: None,
user: None,
..Default::default()
};
let build_directory = tg::run::run(tg, run_arg)
.await?
Expand Down Expand Up @@ -580,6 +570,7 @@ async fn check_in_source_tree(
local_dependencies: true,
locked: false,
lock: false,
..tg::checkin::Options::default()
},
path,
updates: vec![],
Expand Down
Loading