nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 00:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linter fixes

Browse Source
This commit is contained in:
Sylvester Hesp 2022-12-01 15:33:35 +01:00
parent 0a527f0990
commit f0aace570b
15 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/rustc_codegen_spirv/src/abi.rs
View File

@ -575,7 +575,7 @@ fn dig_scalar_pointee<'tcx>(
let new_pointee = dig_scalar_pointee(cx, field, offset - field_offset);
match pointee {
Some(old_pointee) if old_pointee != new_pointee => {
cx.tcx.sess.fatal(&format!(
cx.tcx.sess.fatal(format!(
"dig_scalar_pointee: unsupported Pointer with different \
pointee types ({:?} vs {:?}) at offset {:?} in {:#?}",
old_pointee, new_pointee, offset, layout
@ -860,7 +860,7 @@ fn trans_intrinsic_type<'tcx>(
None => Err(cx
.tcx
.sess
.err(&format!("Invalid value for Image const generic: {}", value))),
.err(format!("Invalid value for Image const generic: {}", value))),
}
}

10
crates/rustc_codegen_spirv/src/attr.rs
View File

@ -146,7 +146,7 @@ impl AggregatedSpirvAttributes {
let (span, parsed_attr) = match parse_attr_result {
Ok(span_and_parsed_attr) => span_and_parsed_attr,
Err((span, msg)) => {
cx.tcx.sess.delay_span_bug(span, &msg);
cx.tcx.sess.delay_span_bug(span, msg);
continue;
}
};
@ -158,7 +158,7 @@ impl AggregatedSpirvAttributes {
}) => {
cx.tcx
.sess
.delay_span_bug(span, &format!("multiple {} attributes", category));
.delay_span_bug(span, format!("multiple {} attributes", category));
}
}
}
@ -264,7 +264,7 @@ impl CheckSpirvAttrVisitor<'_> {
let (span, parsed_attr) = match parse_attr_result {
Ok(span_and_parsed_attr) => span_and_parsed_attr,
Err((span, msg)) => {
self.tcx.sess.span_err(span, &msg);
self.tcx.sess.span_err(span, msg);
continue;
}
};
@ -333,7 +333,7 @@ impl CheckSpirvAttrVisitor<'_> {
if let Err(msg) = valid {
self.tcx.sess.span_err(
span,
&format!("`{:?}` storage class {}", storage_class, msg),
format!("`{:?}` storage class {}", storage_class, msg),
);
}
}
@ -354,7 +354,7 @@ impl CheckSpirvAttrVisitor<'_> {
Err(Expected(expected_target)) => {
self.tcx.sess.span_err(
span,
&format!(
format!(
"attribute is only valid on a {}, not on a {}",
expected_target, target
),

18
crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
View File

@ -105,7 +105,7 @@ impl<'a, 'tcx> AsmBuilderMethods<'tcx> for Builder<'a, 'tcx> {
if let Some(modifier) = modifier {
self.tcx.sess.span_err(
span,
&format!("asm modifiers are not supported: {}", modifier),
format!("asm modifiers are not supported: {}", modifier),
);
}
let line = tokens.last_mut().unwrap();
@ -577,7 +577,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
));
}
if tokens.next().is_some() {
self.tcx.sess.err(&format!(
self.tcx.sess.err(format!(
"too many operands to instruction: {}",
instruction.class.opname
));
@ -792,7 +792,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
_ => {
self.tcx
.sess
.span_err(span, &format!("invalid register: {}", reg));
.span_err(span, format!("invalid register: {}", reg));
}
}
}
@ -916,7 +916,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
other => {
self.tcx.sess.span_err(
span,
&format!(
format!(
"cannot use typeof* on non-pointer type: {}",
other.debug(ty, self)
),
@ -938,7 +938,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
other => {
self.tcx.sess.span_err(
span,
&format!(
format!(
"out register type not pointer: {}",
other.debug(place.llval.ty, self)
),
@ -1159,7 +1159,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
Some(Token::Placeholder(_, span)) => {
self.tcx.sess.span_err(
span,
&format!(
format!(
"expected a literal, not a dynamic value for a {:?}",
kind
),
@ -1168,7 +1168,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
Some(Token::Typeof(_, span, _)) => {
self.tcx.sess.span_err(
span,
&format!("expected a literal, not a type for a {:?}", kind),
format!("expected a literal, not a type for a {:?}", kind),
);
}
None => {
@ -1373,13 +1373,13 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
Token::Placeholder(_, span) => {
self.tcx.sess.span_err(
span,
&format!("expected a literal, not a dynamic value for a {:?}", kind),
format!("expected a literal, not a dynamic value for a {:?}", kind),
);
}
Token::Typeof(_, span, _) => {
self.tcx.sess.span_err(
span,
&format!("expected a literal, not a type for a {:?}", kind),
format!("expected a literal, not a type for a {:?}", kind),
);
}
},

18
crates/rustc_codegen_spirv/src/codegen_cx/constant.rs
View File

@ -66,14 +66,14 @@ impl<'tcx> CodegenCx<'tcx> {
_ => self
.tcx
.sess
.fatal(&format!("Invalid constant value for bool: {}", val)),
.fatal(format!("Invalid constant value for bool: {}", val)),
},
SpirvType::Integer(128, _) => {
let result = self.undef(ty);
self.zombie_no_span(result.def_cx(self), "u128 constant");
result
}
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"constant_int invalid on type {}",
other.debug(ty, self)
)),
@ -94,7 +94,7 @@ impl<'tcx> CodegenCx<'tcx> {
match self.lookup_type(ty) {
SpirvType::Float(32) => self.def_constant(ty, SpirvConst::F32((val as f32).to_bits())),
SpirvType::Float(64) => self.def_constant(ty, SpirvConst::F64(val.to_bits())),
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"constant_float invalid on type {}",
other.debug(ty, self)
)),
@ -233,9 +233,9 @@ impl<'tcx> ConstMethods<'tcx> for CodegenCx<'tcx> {
_ => self
.tcx
.sess
.fatal(&format!("Invalid constant value for bool: {}", data)),
.fatal(format!("Invalid constant value for bool: {}", data)),
},
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"scalar_to_backend Primitive::Int not supported on type {}",
other.debug(ty, self)
)),
@ -273,7 +273,7 @@ impl<'tcx> ConstMethods<'tcx> for CodegenCx<'tcx> {
GlobalAlloc::Memory(alloc) => {
let pointee = match self.lookup_type(ty) {
SpirvType::Pointer { pointee } => pointee,
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"GlobalAlloc::Memory type not implemented: {}",
other.debug(ty, self)
)),
@ -293,7 +293,7 @@ impl<'tcx> ConstMethods<'tcx> for CodegenCx<'tcx> {
.unwrap_memory();
let pointee = match self.lookup_type(ty) {
SpirvType::Pointer { pointee } => pointee,
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"GlobalAlloc::VTable type not implemented: {}",
other.debug(ty, self)
)),
@ -426,7 +426,7 @@ impl<'tcx> CodegenCx<'tcx> {
other => {
self.tcx
.sess
.fatal(&format!("invalid size for integer: {}", other));
.fatal(format!("invalid size for integer: {}", other));
}
};
Primitive::Int(integer, int_signedness)
@ -437,7 +437,7 @@ impl<'tcx> CodegenCx<'tcx> {
other => {
self.tcx
.sess
.fatal(&format!("invalid size for float: {}", other));
.fatal(format!("invalid size for float: {}", other));
}
},
SpirvType::Pointer { .. } => Primitive::Pointer,

8
crates/rustc_codegen_spirv/src/codegen_cx/declare.rs
View File

@ -141,7 +141,7 @@ impl<'tcx> CodegenCx<'tcx> {
self.libm_intrinsics.borrow_mut().insert(fn_id, intrinsic);
}
None => {
self.tcx.sess.err(&format!(
self.tcx.sess.err(format!(
"missing libm intrinsic {}, which is {}",
symbol_name, instance
));
@ -214,7 +214,7 @@ impl<'tcx> PreDefineMethods<'tcx> for CodegenCx<'tcx> {
Linkage::External => Some(LinkageType::Export),
Linkage::Internal => None,
other => {
self.tcx.sess.err(&format!(
self.tcx.sess.err(format!(
"TODO: Linkage type {:?} not supported yet for static var symbol {}",
other, symbol_name
));
@ -244,7 +244,7 @@ impl<'tcx> PreDefineMethods<'tcx> for CodegenCx<'tcx> {
Linkage::External | Linkage::WeakAny => Some(LinkageType::Export),
Linkage::Internal => None,
other => {
self.tcx.sess.err(&format!(
self.tcx.sess.err(format!(
"TODO: Linkage type {:?} not supported yet for function symbol {}",
other, symbol_name
));
@ -277,7 +277,7 @@ impl<'tcx> StaticMethods for CodegenCx<'tcx> {
};
let value_ty = match self.lookup_type(g.ty) {
SpirvType::Pointer { pointee } => pointee,
other => self.tcx.sess.fatal(&format!(
other => self.tcx.sess.fatal(format!(
"global had non-pointer type {}",
other.debug(g.ty, self)
)),

16
crates/rustc_codegen_spirv/src/codegen_cx/entry.rs
View File

@ -38,7 +38,7 @@ impl<'tcx> CodegenCx<'tcx> {
} else {
self.tcx
.sess
.span_err(span, &format!("Cannot declare {} as an entry point", name));
.span_err(span, format!("Cannot declare {} as an entry point", name));
return;
};
let body = self
@ -57,7 +57,7 @@ impl<'tcx> CodegenCx<'tcx> {
if !matches!(arg_abi.layout.ty.kind(), ty::Ref(..)) {
self.tcx.sess.span_err(
hir_param.ty_span,
&format!(
format!(
"entry point parameter type not yet supported \
(`{}` has `ScalarPair` ABI but is not a `&T`)",
arg_abi.layout.ty
@ -69,7 +69,7 @@ impl<'tcx> CodegenCx<'tcx> {
// is any validation concern, it should be done on the types.
PassMode::Ignore => self.tcx.sess.span_fatal(
hir_param.ty_span,
&format!(
format!(
"entry point parameter type not yet supported \
(`{}` has size `0`)",
arg_abi.layout.ty
@ -87,7 +87,7 @@ impl<'tcx> CodegenCx<'tcx> {
} else {
self.tcx.sess.span_err(
span,
&format!(
format!(
"entry point should return `()`, not `{}`",
fn_abi.ret.layout.ty
),
@ -206,7 +206,7 @@ impl<'tcx> CodegenCx<'tcx> {
} else {
self.tcx.sess.span_err(
hir_param.ty_span,
&format!(
format!(
"entry parameter type must be by-reference: `&{}`",
layout.ty,
),
@ -232,7 +232,7 @@ impl<'tcx> CodegenCx<'tcx> {
if !is_ref {
self.tcx.sess.span_fatal(
hir_param.ty_span,
&format!(
format!(
"invalid entry param type `{}` for storage class `{:?}` \
(expected `&{}T`)",
layout.ty,
@ -281,7 +281,7 @@ impl<'tcx> CodegenCx<'tcx> {
(true, hir::Mutability::Mut) => StorageClass::Output,
(true, hir::Mutability::Not) => self.tcx.sess.span_fatal(
hir_param.ty_span,
&format!(
format!(
"invalid entry param type `{}` (expected `{}` or `&mut {1}`)",
layout.ty, value_ty
),
@ -404,7 +404,7 @@ impl<'tcx> CodegenCx<'tcx> {
if is_unsized {
self.tcx.sess.span_fatal(
hir_param.ty_span,
&format!(
format!(
"unsized types are not supported for storage class {:?}",
storage_class
),

4
crates/rustc_codegen_spirv/src/codegen_cx/mod.rs
View File

@ -98,7 +98,7 @@ impl<'tcx> CodegenCx<'tcx> {
.map(|s| s.parse())
.collect::<Result<_, String>>()
.unwrap_or_else(|error| {
tcx.sess.err(&error);
tcx.sess.err(error);
Vec::new()
});
@ -263,7 +263,7 @@ impl CodegenArgs {
pub fn from_session(sess: &Session) -> Self {
match CodegenArgs::parse(&sess.opts.cg.llvm_args) {
Ok(ok) => ok,
Err(err) => sess.fatal(&format!("Unable to parse llvm-args: {}", err)),
Err(err) => sess.fatal(format!("Unable to parse llvm-args: {}", err)),
}
}

14
crates/rustc_codegen_spirv/src/codegen_cx/type_.rs
View File

@ -19,7 +19,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'tcx> {
#[inline]
fn handle_layout_err(&self, err: LayoutError<'tcx>, span: Span, ty: Ty<'tcx>) -> ! {
if let LayoutError::SizeOverflow(_) = err {
self.tcx.sess.span_fatal(span, &err.to_string())
self.tcx.sess.span_fatal(span, err.to_string())
} else {
span_bug!(span, "failed to get layout for `{}`: {}", ty, err)
}
@ -37,7 +37,7 @@ impl<'tcx> FnAbiOfHelpers<'tcx> for CodegenCx<'tcx> {
fn_abi_request: FnAbiRequest<'tcx>,
) -> ! {
if let FnAbiError::Layout(LayoutError::SizeOverflow(_)) = err {
self.tcx.sess.span_fatal(span, &err.to_string())
self.tcx.sess.span_fatal(span, err.to_string())
} else {
match fn_abi_request {
FnAbiRequest::OfFnPtr { sig, extra_args } => {
@ -209,7 +209,7 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
other => self
.tcx
.sess
.fatal(&format!("Invalid float width in type_kind: {}", other)),
.fatal(format!("Invalid float width in type_kind: {}", other)),
},
SpirvType::Adt { .. } | SpirvType::InterfaceBlock { .. } => {
TypeKind::Struct
@ -238,7 +238,7 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
match self.lookup_type(ty) {
SpirvType::Pointer { pointee } => pointee,
SpirvType::Vector { element, .. } => element,
spirv_type => self.tcx.sess.fatal(&format!(
spirv_type => self.tcx.sess.fatal(format!(
"element_type called on invalid type: {:?}",
spirv_type
)),
@ -249,7 +249,7 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
fn vector_length(&self, ty: Self::Type) -> usize {
match self.lookup_type(ty) {
SpirvType::Vector { count, .. } => count as usize,
ty => self.tcx.sess.fatal(&format!(
ty => self.tcx.sess.fatal(format!(
"vector_length called on non-vector type: {:?}",
ty
)),
@ -262,7 +262,7 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
ty => self
.tcx
.sess
.fatal(&format!("float_width called on non-float type: {:?}", ty)),
.fatal(format!("float_width called on non-float type: {:?}", ty)),
}
}
@ -273,7 +273,7 @@ impl<'tcx> BaseTypeMethods<'tcx> for CodegenCx<'tcx> {
ty => self
.tcx
.sess
.fatal(&format!("int_width called on non-integer type: {:?}", ty)),
.fatal(format!("int_width called on non-integer type: {:?}", ty)),
}
}

16
crates/rustc_codegen_spirv/src/link.rs
View File

@ -66,7 +66,7 @@ pub fn link<'a>(
link_exe(sess, crate_type, &out_filename, codegen_results);
}
other => {
sess.err(&format!("CrateType {:?} not supported yet", other));
sess.err(format!("CrateType {:?} not supported yet", other));
}
}
}
@ -99,7 +99,7 @@ fn link_rlib(sess: &Session, codegen_results: &CodegenResults, out_filename: &Pa
| NativeLibKind::Unspecified => continue,
}
if let Some(name) = lib.name {
sess.err(&format!(
sess.err(format!(
"Adding native library to rlib not supported yet: {}",
name
));
@ -236,7 +236,7 @@ fn post_link_single_module(
(optlevel, false) => format!("optlevel={:?}", optlevel),
(optlevel, true) => format!("optlevel={:?}, debuginfo=None", optlevel),
};
sess.warn(&format!(
sess.warn(format!(
"spirv-opt should have ran ({}) but was disabled by NO_SPIRV_OPT",
reason
));
@ -420,11 +420,11 @@ fn add_upstream_native_libraries(
continue;
}
match lib.kind {
NativeLibKind::Dylib { .. } | NativeLibKind::Unspecified => sess.fatal(&format!(
NativeLibKind::Dylib { .. } | NativeLibKind::Unspecified => sess.fatal(format!(
"TODO: dylib nativelibkind not supported yet: {}",
name
)),
NativeLibKind::Framework { .. } => sess.fatal(&format!(
NativeLibKind::Framework { .. } => sess.fatal(format!(
"TODO: framework nativelibkind not supported yet: {}",
name
)),
@ -433,7 +433,7 @@ fn add_upstream_native_libraries(
..
} => {
if data[cnum.as_usize() - 1] == Linkage::Static {
sess.fatal(&format!(
sess.fatal(format!(
"TODO: staticnobundle nativelibkind not supported yet: {}",
name
))
@ -444,9 +444,9 @@ fn add_upstream_native_libraries(
..
} => {}
NativeLibKind::RawDylib => {
sess.fatal(&format!("raw_dylib feature not yet implemented: {}", name))
sess.fatal(format!("raw_dylib feature not yet implemented: {}", name))
}
NativeLibKind::LinkArg => sess.fatal(&format!(
NativeLibKind::LinkArg => sess.fatal(format!(
"TODO: linkarg nativelibkind not supported yet: {}",
name
)),

4
crates/rustc_codegen_spirv/src/linker/import_export_link.rs
View File

@ -56,7 +56,7 @@ fn find_import_export_pairs_and_killed_params(
};
let type_id = *type_map.get(&id).expect("Unexpected op");
if exports.insert(name, (id, type_id)).is_some() {
return Err(sess.err(&format!("Multiple exports found for {:?}", name)));
return Err(sess.err(format!("Multiple exports found for {:?}", name)));
}
}
let mut any_err = None;
@ -68,7 +68,7 @@ fn find_import_export_pairs_and_killed_params(
};
let (export_id, export_type) = match exports.get(name) {
None => {
any_err = Some(sess.err(&format!("Unresolved symbol {:?}", name)));
any_err = Some(sess.err(format!("Unresolved symbol {:?}", name)));
continue;
}
Some(&x) => x,

4
crates/rustc_codegen_spirv/src/linker/inline.rs
View File

@ -51,7 +51,7 @@ pub fn inline(sess: &Session, module: &mut Module) -> super::Result<()> {
if !inlined_dont_inlines.is_empty() {
let names = get_names(module);
for f in inlined_dont_inlines {
sess.warn(&format!(
sess.warn(format!(
"`#[inline(never)]` function `{}` needs to be inlined \
because it has illegal argument or return types",
get_name(&names, f)
@ -122,7 +122,7 @@ fn deny_recursion_in_module(sess: &Session, module: &Module) -> super::Result<()
let names = get_names(module);
let current_name = get_name(&names, module.functions[current].def_id().unwrap());
let next_name = get_name(&names, module.functions[next].def_id().unwrap());
*has_recursion = Some(sess.err(&format!(
*has_recursion = Some(sess.err(format!(
"module has recursion, which is not allowed: `{}` calls `{}`",
current_name, next_name
)));

2
crates/rustc_codegen_spirv/src/linker/mod.rs
View File

@ -123,7 +123,7 @@ pub fn link(sess: &Session, mut inputs: Vec<Module>, opts: &Options) -> Result<L
bound += module.header.as_ref().unwrap().bound - 1;
let this_version = module.header.as_ref().unwrap().version();
if version != this_version {
sess.fatal(&format!(
sess.fatal(format!(
"cannot link two modules with different SPIR-V versions: v{}.{} and v{}.{}",
version.0, version.1, this_version.0, this_version.1
))

2
crates/rustc_codegen_spirv/src/spirv_type.rs
View File

@ -304,7 +304,7 @@ impl SpirvType<'_> {
ref other => cx
.tcx
.sess
.fatal(&format!("def_with_id invalid for type {:?}", other)),
.fatal(format!("def_with_id invalid for type {:?}", other)),
};
cx.type_cache_def(result, self.tcx_arena_alloc_slices(cx), def_span);
result

2
crates/spirv-std/macros/src/lib.rs
View File

@ -564,7 +564,7 @@ fn debug_printf_inner(input: DebugPrintfInput) -> TokenStream {
if format_arguments.len() != variables.len() {
return syn::Error::new(
span,
&format!(
format!(
"{} % arguments were found, but {} variables were given",
format_arguments.len(),
variables.len()

2
examples/runners/wgpu/builder/src/main.rs
View File

@ -12,7 +12,7 @@ fn build_shader(path_to_crate: &str, codegen_names: bool) -> Result<(), Box<dyn
let out_dir = env::var_os("OUT_DIR").unwrap();
let dest_path = Path::new(&out_dir).join("entry_points.rs");
fs::create_dir_all(&out_dir).unwrap();
fs::write(&dest_path, result.codegen_entry_point_strings()).unwrap();
fs::write(dest_path, result.codegen_entry_point_strings()).unwrap();
}
Ok(())
}