Skip to content

Commit ca91744

Browse files
ErichDonGublerErichDonGubler
committed
chore: apply unused_qualifications lint via cargo +1.78.0 fix && cargo fmt 
1 parent f1b06f5 commit ca91744

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+217
-235
lines changed

‎naga/src/back/glsl/features.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ impl<'a, W> Writer<'a, W> {
345345
}
346346

347347
// If the type of this global is a struct
348-
if let crate::TypeInner::Struct { ref members, .. } =
348+
if let TypeInner::Struct { ref members, .. } =
349349
self.module.types[global.ty].inner
350350
{
351351
// Check the last element of the struct to see if it's type uses
@@ -472,7 +472,7 @@ impl<'a, W> Writer<'a, W> {
472472
// layers queries are also implemented as size queries
473473
crate::ImageQuery::Size { .. } | crate::ImageQuery::NumLayers => {
474474
if let TypeInner::Image {
475-
class: crate::ImageClass::Storage { .. }, ..
475+
class: ImageClass::Storage { .. }, ..
476476
} = *info[image].ty.inner_with(&module.types) {
477477
features.request(Features::IMAGE_SIZE)
478478
}
@@ -558,7 +558,7 @@ impl<'a, W> Writer<'a, W> {
558558

559559
fn varying_required_features(&mut self, binding: Option<&Binding>, ty: Handle<Type>) {
560560
match self.module.types[ty].inner {
561-
crate::TypeInner::Struct { ref members, .. } => {
561+
TypeInner::Struct { ref members, .. } => {
562562
for member in members {
563563
self.varying_required_features(member.binding.as_ref(), member.ty);
564564
}

‎naga/src/back/glsl/mod.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ impl<'a, W: Write> Writer<'a, W> {
12481248
self.reflection_names_globals.insert(handle, block_name);
12491249

12501250
match self.module.types[global.ty].inner {
1251-
crate::TypeInner::Struct { ref members, .. }
1251+
TypeInner::Struct { ref members, .. }
12521252
if self.module.types[members.last().unwrap().ty]
12531253
.inner
12541254
.is_dynamically_sized(&self.module.types) =>
@@ -1429,7 +1429,7 @@ impl<'a, W: Write> Writer<'a, W> {
14291429
output: bool,
14301430
) -> Result<(), Error> {
14311431
// For a struct, emit a separate global for each member with a binding.
1432-
if let crate::TypeInner::Struct { ref members, .. } = self.module.types[ty].inner {
1432+
if let TypeInner::Struct { ref members, .. } = self.module.types[ty].inner {
14331433
for member in members {
14341434
self.write_varying(member.binding.as_ref(), member.ty, output)?;
14351435
}
@@ -1701,7 +1701,7 @@ impl<'a, W: Write> Writer<'a, W> {
17011701
write!(self.out, " {name}")?;
17021702
write!(self.out, " = ")?;
17031703
match self.module.types[arg.ty].inner {
1704-
crate::TypeInner::Struct { ref members, .. } => {
1704+
TypeInner::Struct { ref members, .. } => {
17051705
self.write_type(arg.ty)?;
17061706
write!(self.out, "(")?;
17071707
for (index, member) in members.iter().enumerate() {
@@ -2186,7 +2186,7 @@ impl<'a, W: Write> Writer<'a, W> {
21862186
if let Some(ref result) = ep.function.result {
21872187
let value = value.unwrap();
21882188
match self.module.types[result.ty].inner {
2189-
crate::TypeInner::Struct { ref members, .. } => {
2189+
TypeInner::Struct { ref members, .. } => {
21902190
let temp_struct_name = match ctx.expressions[value] {
21912191
crate::Expression::Compose { .. } => {
21922192
let return_struct = "_tmp_return";
@@ -2968,7 +2968,7 @@ impl<'a, W: Write> Writer<'a, W> {
29682968
if let Some(expr) = level {
29692969
let cast_to_int = matches!(
29702970
*ctx.resolve_type(expr, &self.module.types),
2971-
crate::TypeInner::Scalar(crate::Scalar {
2971+
TypeInner::Scalar(crate::Scalar {
29722972
kind: crate::ScalarKind::Uint,
29732973
..
29742974
})
@@ -3311,7 +3311,7 @@ impl<'a, W: Write> Writer<'a, W> {
33113311
self.write_expr(arg, ctx)?;
33123312

33133313
match *ctx.resolve_type(arg, &self.module.types) {
3314-
crate::TypeInner::Vector { size, .. } => write!(
3314+
TypeInner::Vector { size, .. } => write!(
33153315
self.out,
33163316
", vec{}(0.0), vec{0}(1.0)",
33173317
back::vector_size_str(size)
@@ -3358,15 +3358,15 @@ impl<'a, W: Write> Writer<'a, W> {
33583358
Mf::Pow => "pow",
33593359
// geometry
33603360
Mf::Dot => match *ctx.resolve_type(arg, &self.module.types) {
3361-
crate::TypeInner::Vector {
3361+
TypeInner::Vector {
33623362
scalar:
33633363
crate::Scalar {
33643364
kind: crate::ScalarKind::Float,
33653365
..
33663366
},
33673367
..
33683368
} => "dot",
3369-
crate::TypeInner::Vector { size, .. } => {
3369+
TypeInner::Vector { size, .. } => {
33703370
return self.write_dot_product(arg, arg1.unwrap(), size as usize, ctx)
33713371
}
33723372
_ => unreachable!(
@@ -3418,7 +3418,7 @@ impl<'a, W: Write> Writer<'a, W> {
34183418
// bits
34193419
Mf::CountTrailingZeros => {
34203420
match *ctx.resolve_type(arg, &self.module.types) {
3421-
crate::TypeInner::Vector { size, scalar, .. } => {
3421+
TypeInner::Vector { size, scalar, .. } => {
34223422
let s = back::vector_size_str(size);
34233423
if let crate::ScalarKind::Uint = scalar.kind {
34243424
write!(self.out, "min(uvec{s}(findLSB(")?;
@@ -3430,7 +3430,7 @@ impl<'a, W: Write> Writer<'a, W> {
34303430
write!(self.out, ")), uvec{s}(32u)))")?;
34313431
}
34323432
}
3433-
crate::TypeInner::Scalar(scalar) => {
3433+
TypeInner::Scalar(scalar) => {
34343434
if let crate::ScalarKind::Uint = scalar.kind {
34353435
write!(self.out, "min(uint(findLSB(")?;
34363436
self.write_expr(arg, ctx)?;
@@ -3448,7 +3448,7 @@ impl<'a, W: Write> Writer<'a, W> {
34483448
Mf::CountLeadingZeros => {
34493449
if self.options.version.supports_integer_functions() {
34503450
match *ctx.resolve_type(arg, &self.module.types) {
3451-
crate::TypeInner::Vector { size, scalar } => {
3451+
TypeInner::Vector { size, scalar } => {
34523452
let s = back::vector_size_str(size);
34533453

34543454
if let crate::ScalarKind::Uint = scalar.kind {
@@ -3463,7 +3463,7 @@ impl<'a, W: Write> Writer<'a, W> {
34633463
write!(self.out, ", ivec{s}(0)))")?;
34643464
}
34653465
}
3466-
crate::TypeInner::Scalar(scalar) => {
3466+
TypeInner::Scalar(scalar) => {
34673467
if let crate::ScalarKind::Uint = scalar.kind {
34683468
write!(self.out, "uint(31 - findMSB(")?;
34693469
} else {
@@ -3479,7 +3479,7 @@ impl<'a, W: Write> Writer<'a, W> {
34793479
};
34803480
} else {
34813481
match *ctx.resolve_type(arg, &self.module.types) {
3482-
crate::TypeInner::Vector { size, scalar } => {
3482+
TypeInner::Vector { size, scalar } => {
34833483
let s = back::vector_size_str(size);
34843484

34853485
if let crate::ScalarKind::Uint = scalar.kind {
@@ -3497,7 +3497,7 @@ impl<'a, W: Write> Writer<'a, W> {
34973497
write!(self.out, ", ivec{s}(0u))))")?;
34983498
}
34993499
}
3500-
crate::TypeInner::Scalar(scalar) => {
3500+
TypeInner::Scalar(scalar) => {
35013501
if let crate::ScalarKind::Uint = scalar.kind {
35023502
write!(self.out, "uint(31.0 - floor(log2(float(")?;
35033503
self.write_expr(arg, ctx)?;
@@ -3605,11 +3605,11 @@ impl<'a, W: Write> Writer<'a, W> {
36053605
// Check if the argument is an unsigned integer and return the vector size
36063606
// in case it's a vector
36073607
let maybe_uint_size = match *ctx.resolve_type(arg, &self.module.types) {
3608-
crate::TypeInner::Scalar(crate::Scalar {
3608+
TypeInner::Scalar(crate::Scalar {
36093609
kind: crate::ScalarKind::Uint,
36103610
..
36113611
}) => Some(None),
3612-
crate::TypeInner::Vector {
3612+
TypeInner::Vector {
36133613
scalar:
36143614
crate::Scalar {
36153615
kind: crate::ScalarKind::Uint,
@@ -4402,7 +4402,7 @@ impl<'a, W: Write> Writer<'a, W> {
44024402
continue;
44034403
}
44044404
match self.module.types[var.ty].inner {
4405-
crate::TypeInner::Image { .. } => {
4405+
TypeInner::Image { .. } => {
44064406
let tex_name = self.reflection_names_globals[&handle].clone();
44074407
match texture_mapping.entry(tex_name) {
44084408
Entry::Vacant(v) => {
@@ -4438,7 +4438,7 @@ impl<'a, W: Write> Writer<'a, W> {
44384438
//
44394439
// This is potentially a bit wasteful, but the set of types in the program
44404440
// shouldn't be too large.
4441-
let mut layouter = crate::proc::Layouter::default();
4441+
let mut layouter = proc::Layouter::default();
44424442
layouter.update(self.module.to_ctx()).unwrap();
44434443

44444444
// We start with the name of the binding itself.
@@ -4466,7 +4466,7 @@ impl<'a, W: Write> Writer<'a, W> {
44664466
&mut self,
44674467
ty: Handle<crate::Type>,
44684468
segments: &mut Vec<String>,
4469-
layouter: &crate::proc::Layouter,
4469+
layouter: &proc::Layouter,
44704470
offset: &mut u32,
44714471
items: &mut Vec<PushConstantItem>,
44724472
) {

‎naga/src/back/hlsl/writer.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
162162
}
163163
crate::MathFunction::CountLeadingZeros => {
164164
let inner = info[fun_handle].ty.inner_with(&module.types);
165-
if let Some(crate::ScalarKind::Sint) = inner.scalar_kind() {
165+
if let Some(ScalarKind::Sint) = inner.scalar_kind() {
166166
self.need_bake_expressions.insert(arg);
167167
}
168168
}
@@ -450,7 +450,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
450450
second_blend_source: false,
451451
..
452452
}) => {
453-
if stage == Some((crate::ShaderStage::Fragment, Io::Output)) {
453+
if stage == Some((ShaderStage::Fragment, Io::Output)) {
454454
write!(self.out, " : SV_Target{location}")?;
455455
} else {
456456
write!(self.out, " : {LOCATION_SEMANTIC}{location}")?;
@@ -994,7 +994,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
994994
columns,
995995
scalar,
996996
} if member.binding.is_none() && rows == crate::VectorSize::Bi => {
997-
let vec_ty = crate::TypeInner::Vector { size: rows, scalar };
997+
let vec_ty = TypeInner::Vector { size: rows, scalar };
998998
let field_name_key = NameKey::StructMember(handle, index as u32);
999999

10001000
for i in 0..columns as u8 {
@@ -2397,7 +2397,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
23972397
left,
23982398
right,
23992399
} if func_ctx.resolve_type(left, &module.types).scalar_kind()
2400-
== Some(crate::ScalarKind::Float) =>
2400+
== Some(ScalarKind::Float) =>
24012401
{
24022402
write!(self.out, "fmod(")?;
24032403
self.write_expr(module, left, func_ctx)?;
@@ -2408,7 +2408,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
24082408
Expression::Binary { op, left, right } => {
24092409
write!(self.out, "(")?;
24102410
self.write_expr(module, left, func_ctx)?;
2411-
write!(self.out, " {} ", crate::back::binary_operation_str(op))?;
2411+
write!(self.out, " {} ", back::binary_operation_str(op))?;
24122412
self.write_expr(module, right, func_ctx)?;
24132413
write!(self.out, ")")?;
24142414
}

‎naga/src/back/msl/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ pub fn write_string(
533533
options: &Options,
534534
pipeline_options: &PipelineOptions,
535535
) -> Result<(String, TranslationInfo), Error> {
536-
let mut w = writer::Writer::new(String::new());
536+
let mut w = Writer::new(String::new());
537537
let info = w.write(module, info, options, pipeline_options)?;
538538
Ok((w.finish(), info))
539539
}

‎naga/src/back/msl/writer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,7 @@ impl<W: Write> Writer<W> {
15961596
write!(self.out, ")")?;
15971597
}
15981598
crate::Expression::Binary { op, left, right } => {
1599-
let op_str = crate::back::binary_operation_str(op);
1599+
let op_str = back::binary_operation_str(op);
16001600
let kind = context
16011601
.resolve_type(left)
16021602
.scalar_kind()
@@ -3973,7 +3973,7 @@ impl<W: Write> Writer<W> {
39733973
// mapping.
39743974
let mut flattened_member_names = FastHashMap::default();
39753975
// Varyings' members get their own namespace
3976-
let mut varyings_namer = crate::proc::Namer::default();
3976+
let mut varyings_namer = proc::Namer::default();
39773977

39783978
// List all the Naga `EntryPoint`'s `Function`'s arguments,
39793979
// flattening structs into their members. In Metal, we will pass
@@ -4804,7 +4804,7 @@ fn test_stack_size() {
48044804
);
48054805
let _ = module.functions.append(fun, Default::default());
48064806
// analyse the module
4807-
let info = crate::valid::Validator::new(ValidationFlags::empty(), Capabilities::empty())
4807+
let info = valid::Validator::new(ValidationFlags::empty(), Capabilities::empty())
48084808
.validate(&module)
48094809
.unwrap();
48104810
// process the module

‎naga/src/back/pipeline_constants.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ fn adjust_stmt(new_pos: &[Handle<Expression>], stmt: &mut Statement) {
609609
}
610610
adjust(value);
611611
}
612-
crate::Statement::Atomic {
612+
Statement::Atomic {
613613
ref mut pointer,
614614
ref mut value,
615615
ref mut result,
@@ -728,7 +728,7 @@ fn adjust_stmt(new_pos: &[Handle<Expression>], stmt: &mut Statement) {
728728
/// [`needs_pre_emit`]: Expression::needs_pre_emit
729729
/// [`Override`]: Expression::Override
730730
fn filter_emits_in_block(block: &mut Block, expressions: &Arena<Expression>) {
731-
let original = std::mem::replace(block, Block::with_capacity(block.len()));
731+
let original = mem::replace(block, Block::with_capacity(block.len()));
732732
for (stmt, span) in original.span_into_iter() {
733733
match stmt {
734734
Statement::Emit(range) => {

0 commit comments

Comments
 (0)