Skip to content
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.

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

moved .cargo/config to .cargo/config.toml #837

Merged
merged 3 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
3 changes: 2 additions & 1 deletion ci/bootstrap-env/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ fn main() -> Result<()> {
);

// Persist contract code_ids in local.yaml so we can use SKIP_CONTRACT_STORE locally to avoid having to re-store them again
cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
cfg.contract_deploy_info
.clone_from(orc.contract_map.deploy_info());
fs::write(
"ci/configs/cosm-orc/local.yaml",
serde_yaml::to_string(&cfg)?,
Expand Down
3 changes: 2 additions & 1 deletion ci/integration-tests/src/helpers/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ fn global_setup() -> Cfg {
.unwrap();
save_gas_report(&orc, &gas_report_dir);
// persist stored code_ids in CONFIG, so we can reuse for all tests
cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
cfg.contract_deploy_info
.clone_from(orc.contract_map.deploy_info());
}

Cfg {
Expand Down
4 changes: 0 additions & 4 deletions contracts/dao-dao-core/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/external/cw-admin-factory/.cargo/config

This file was deleted.

5 changes: 0 additions & 5 deletions contracts/external/cw-fund-distributor/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/external/cw-payroll-factory/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/external/cw-token-swap/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/external/cw-tokenfactory-issuer/.cargo/config

This file was deleted.

6 changes: 0 additions & 6 deletions contracts/external/cw-vesting/.cargo/config

This file was deleted.

5 changes: 0 additions & 5 deletions contracts/external/cw721-roles/.cargo/config

This file was deleted.

4 changes: 2 additions & 2 deletions contracts/external/cw721-roles/src/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ pub fn execute_update_token_role(
let mut token = contract.tokens.load(deps.storage, &token_id)?;

// Update role with new value
token.extension.role = role.clone();
token.extension.role.clone_from(&role);
contract.tokens.save(deps.storage, &token_id, &token)?;

Ok(Response::default()
Expand All @@ -341,7 +341,7 @@ pub fn execute_update_token_uri(
let mut token = contract.tokens.load(deps.storage, &token_id)?;

// Set new token URI
token.token_uri = token_uri.clone();
token.token_uri.clone_from(&token_uri);
contract.tokens.save(deps.storage, &token_id, &token)?;

Ok(Response::new()
Expand Down
4 changes: 0 additions & 4 deletions contracts/external/dao-migrator/.cargo/config

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/pre-propose/dao-pre-propose-approver/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/pre-propose/dao-pre-propose-multiple/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/pre-propose/dao-pre-propose-single/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/proposal/dao-proposal-condorcet/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/proposal/dao-proposal-multiple/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/proposal/dao-proposal-single/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/staking/cw20-stake-external-rewards/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/staking/cw20-stake-reward-distributor/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/staking/cw20-stake/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/test/dao-proposal-hook-counter/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/test/dao-proposal-sudo/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/test/dao-test-custom-factory/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/test/dao-voting-cw20-balance/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/voting/dao-voting-cw20-staked/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/voting/dao-voting-cw4/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/voting/dao-voting-cw721-roles/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/voting/dao-voting-cw721-staked/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions contracts/voting/dao-voting-token-staked/.cargo/config

This file was deleted.

2 changes: 0 additions & 2 deletions packages/dao-dao-macros/.cargo/config

This file was deleted.

2 changes: 0 additions & 2 deletions packages/dao-interface/.cargo/config

This file was deleted.

4 changes: 0 additions & 4 deletions packages/dao-pre-propose-base/.cargo/config

This file was deleted.

Loading