Skip to content

minor naga span updates#7029

Merged
cwfitzgerald merged 5 commits intogfx-rs:trunkfrom
brody2consult:minor-naga-span-updates
Jan 30, 2025
Merged

minor naga span updates#7029
cwfitzgerald merged 5 commits intogfx-rs:trunkfrom
brody2consult:minor-naga-span-updates

Conversation

@brody2consult
Copy link
Copy Markdown
Contributor

Connections

trigger is reducing dependency on std::error::Error for other PR: #6938

(help with no-std support as requested in issue: #6826)

Description

  • move internal naga span::AddSpan code to keep internal AddSpan trait & impl together
  • remove where dependency on std::error::Error from AddSpan impl
  • add blank lines & returned output type comments to AddSpan & MapErrWithSpan traits
  • update MapErrWithSpan to be pub(crate) trait

NOTE: I am submitting this with multiple commits to hopefully keep these proposed updates as clear as possible. I would be happy to squash if needed. I would also be happy to revert the MapErrWithSpan trait visibility update if needed.

Testing

see checklist below

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy. If applicable, add:
    • --target wasm32-unknown-unknown
  • Run cargo xtask test to run tests.
  • Add change to CHANGELOG.md. See simple instructions inside file.

Comment thread naga/src/span.rs

impl<E> AddSpan for E
where
E: Error,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow this was just flat out not needed?

@cwfitzgerald
Copy link
Copy Markdown
Member

NOTE: I am submitting this with multiple commits to hopefully keep these proposed updates as clear as possible.

Sounds good, will rebase-and-merge these.

I would be happy to squash if needed.

We always have the squash-and-merge button, so feel free to be as messy with commits as you want, as long as you want us to review as a whole as opposed to commit-by-commit.

@cwfitzgerald cwfitzgerald merged commit 55c33b0 into gfx-rs:trunk Jan 30, 2025
@brody2consult brody2consult deleted the minor-naga-span-updates branch January 30, 2025 02:24
@brody2consult
Copy link
Copy Markdown
Contributor Author

brody2consult commented Jan 30, 2025

@cwfitzgerald it looks to me like you did some kind of rebase merge, with 4 commits added to trunk now. Not a big deal but not as I had expected

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants