mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-25 20:01:50 +00:00
Bug 1617369 - Reformat recent rust changes with rustfmt r=emilio,extension-reviewers,willdurand
# ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D148376
This commit is contained in:
parent
b176094a3b
commit
b848a697dc
@ -0,0 +1 @@
|
||||
|
@ -0,0 +1 @@
|
||||
|
@ -0,0 +1 @@
|
||||
|
@ -0,0 +1 @@
|
||||
|
@ -3,7 +3,7 @@
|
||||
// <http://opensource.org/licenses/MIT>, at your option.
|
||||
|
||||
pub use itoa::*;
|
||||
use std::{io, fmt};
|
||||
use std::{fmt, io};
|
||||
|
||||
// APIs that were in itoa 0.4 but aren't in 1.0.
|
||||
|
||||
|
@ -2294,7 +2294,7 @@ fn read_font_descriptor(bytes: &mut WrVecU8, index: u32) -> NativeFontHandle {
|
||||
fn read_font_descriptor(bytes: &mut WrVecU8, _index: u32) -> NativeFontHandle {
|
||||
let chars = bytes.flush_into_vec();
|
||||
NativeFontHandle {
|
||||
name: String::from_utf8(chars).unwrap()
|
||||
name: String::from_utf8(chars).unwrap(),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -9,8 +9,8 @@ use crate::{
|
||||
|
||||
use wgc::{gfx_select, id};
|
||||
|
||||
use std::{error::Error, os::raw::c_char, ptr, slice};
|
||||
use std::sync::atomic::{AtomicU32, Ordering};
|
||||
use std::{error::Error, os::raw::c_char, ptr, slice};
|
||||
|
||||
/// A fixed-capacity, null-terminated error buffer owned by C++.
|
||||
///
|
||||
@ -222,8 +222,10 @@ pub extern "C" fn wgpu_server_device_create_buffer(
|
||||
let usage = match wgt::BufferUsages::from_bits(usage) {
|
||||
Some(usage) => usage,
|
||||
None => {
|
||||
error_buf.init_str("GPUBufferDescriptor's 'usage' includes invalid unimplemented bits \
|
||||
or unimplemented usages");
|
||||
error_buf.init_str(
|
||||
"GPUBufferDescriptor's 'usage' includes invalid unimplemented bits \
|
||||
or unimplemented usages",
|
||||
);
|
||||
gfx_select!(self_id => global.create_buffer_error(buffer_id, label));
|
||||
return;
|
||||
}
|
||||
@ -255,7 +257,7 @@ pub unsafe extern "C" fn wgpu_server_buffer_map(
|
||||
let callback = wgc::resource::BufferMapCallback::from_c(callback);
|
||||
let operation = wgc::resource::BufferMapOperation {
|
||||
host: map_mode,
|
||||
callback
|
||||
callback,
|
||||
};
|
||||
gfx_select!(buffer_id => global.buffer_map_async(
|
||||
buffer_id,
|
||||
|
@ -351,12 +351,7 @@ impl DateTimeFormat {
|
||||
// ICU needs null-termination here, otherwise we could use nsCStr.
|
||||
let loc: nsCString = locale.to_string().into();
|
||||
Self {
|
||||
raw: unsafe {
|
||||
NonNull::new(ffi::FluentBuiltInDateTimeFormatterCreate(
|
||||
&loc,
|
||||
options,
|
||||
))
|
||||
},
|
||||
raw: unsafe { NonNull::new(ffi::FluentBuiltInDateTimeFormatterCreate(&loc, options)) },
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -530,9 +530,12 @@ impl<'static_env, 'module_env> TransEnv<'static_env, 'module_env> {
|
||||
fn switch_to_indirect_callee_realm(&mut self, pos: &mut FuncCursor, vmctx: ir::Value) {
|
||||
let ptr = POINTER_TYPE;
|
||||
let flags = ir::MemFlags::trusted();
|
||||
let cx = pos
|
||||
.ins()
|
||||
.load(ptr, flags, vmctx, offset32(self.static_env.cx_instance_offset));
|
||||
let cx = pos.ins().load(
|
||||
ptr,
|
||||
flags,
|
||||
vmctx,
|
||||
offset32(self.static_env.cx_instance_offset),
|
||||
);
|
||||
let realm = pos.ins().load(
|
||||
ptr,
|
||||
flags,
|
||||
@ -553,9 +556,12 @@ impl<'static_env, 'module_env> TransEnv<'static_env, 'module_env> {
|
||||
) {
|
||||
let ptr = POINTER_TYPE;
|
||||
let flags = ir::MemFlags::trusted();
|
||||
let cx = pos
|
||||
.ins()
|
||||
.load(ptr, flags, vmctx, offset32(self.static_env.cx_instance_offset));
|
||||
let cx = pos.ins().load(
|
||||
ptr,
|
||||
flags,
|
||||
vmctx,
|
||||
offset32(self.static_env.cx_instance_offset),
|
||||
);
|
||||
let realm = pos.ins().load(
|
||||
ptr,
|
||||
flags,
|
||||
|
@ -30,8 +30,8 @@ use crossbeam_utils::atomic::AtomicCell;
|
||||
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
|
||||
use moz_task::{create_background_task_queue, is_main_thread, Task, TaskRunnable};
|
||||
use nserror::{
|
||||
nsresult, NS_ERROR_FAILURE, NS_ERROR_NOT_SAME_THREAD,
|
||||
NS_ERROR_NULL_POINTER, NS_ERROR_UNEXPECTED, NS_OK,
|
||||
nsresult, NS_ERROR_FAILURE, NS_ERROR_NOT_SAME_THREAD, NS_ERROR_NULL_POINTER,
|
||||
NS_ERROR_UNEXPECTED, NS_OK,
|
||||
};
|
||||
use nsstring::{nsACString, nsCStr, nsCString, nsString};
|
||||
use rkv::backend::{BackendEnvironmentBuilder, SafeMode, SafeModeDatabase, SafeModeEnvironment};
|
||||
|
@ -10,8 +10,8 @@ use std::{
|
||||
};
|
||||
|
||||
use golden_gate::{ApplyResults, BridgedEngine, Guid, IncomingEnvelope};
|
||||
use once_cell::sync::OnceCell;
|
||||
use interrupt_support::SqlInterruptHandle;
|
||||
use once_cell::sync::OnceCell;
|
||||
use webext_storage::store::Store;
|
||||
|
||||
use crate::error::{Error, Result};
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
use compact_symbol_table::CompactSymbolTable;
|
||||
use object::read::{NativeFile, Object};
|
||||
use object::{ObjectSection, ObjectSymbol, SymbolKind, SectionKind};
|
||||
use object::{ObjectSection, ObjectSymbol, SectionKind, SymbolKind};
|
||||
use std::cmp;
|
||||
use std::collections::HashMap;
|
||||
use uuid::Uuid;
|
||||
@ -20,7 +20,12 @@ where
|
||||
.dynamic_symbols()
|
||||
.chain(object_file.symbols())
|
||||
.filter(|symbol| symbol.kind() == SymbolKind::Text)
|
||||
.filter_map(|symbol| symbol.name().map(|name| (symbol.address() as u32, name)).ok())
|
||||
.filter_map(|symbol| {
|
||||
symbol
|
||||
.name()
|
||||
.map(|name| (symbol.address() as u32, name))
|
||||
.ok()
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user