Skip to content

Commit

Permalink
update platform010, platform010-arch64 & xplat to 1.70.0
Browse files Browse the repository at this point in the history
Summary: Detailed release notes can be found at https://releases.rs/docs/1.70.0/

Reviewed By: dtolnay

Differential Revision: D46375839

fbshipit-source-id: c9473d2b64f7f1f4c5a3122f728b5a4274345c7d
  • Loading branch information
diliop authored and facebook-github-bot committed Jun 9, 2023
1 parent 58e0ebc commit 87758a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions allocative/allocative/src/impls/std/unsorted.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 218,7 @@ impl Allocative for ! {

impl<T: Allocative> Allocative for [T] {
fn visit<'a, 'b: 'a>(&self, visitor: &'a mut Visitor<'b>) {
let mut visitor =
visitor.enter(Key::for_type_name::<T>(), mem::size_of::<T>() * self.len());
let mut visitor = visitor.enter(Key::for_type_name::<T>(), mem::size_of_val::<[T]>(self));
for item in self {
// TODO(nga): faster for primitive.
visitor.visit_field(DATA_NAME, item);
Expand Down
4 changes: 1 addition & 3 deletions starlark/src/debug/evaluate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 15,6 @@
* limitations under the License.
*/

use std::mem;

use crate::collections::SmallMap;
use crate::debug::inspect::to_scope_names_by_local_slot_id;
use crate::eval::runtime::slots::LocalSlotIdCapturedOrNot;
Expand Down Expand Up @@ -80,7 78,7 @@ impl<'v, 'a> Evaluator<'v, 'a> {
}
}

let orig_module_variables = mem::replace(&mut self.module_variables, None);
let orig_module_variables = self.module_variables.take();
let globals = self.top_frame_def_info_for_debugger()?.globals;
let res = self.eval_module(statements, &globals);
self.module_variables = orig_module_variables;
Expand Down
2 changes: 1 addition & 1 deletion starlark/src/eval/bc/addr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 93,7 @@ impl BcPtrRange {
pub(crate) fn for_slice(slice: &[u64]) -> BcPtrRange {
BcPtrRange {
start: slice.as_ptr() as *const u8,
len: slice.len() * mem::size_of::<u64>(),
len: mem::size_of_val::<[u64]>(slice),
}
}

Expand Down

0 comments on commit 87758a5

Please sign in to comment.