Put PartialOrd before Ord

Summary: Since PartialOrd is less restrictive it should come first. Done mainly so we can have a consistent order so I can grep for it and find these things to refactor later.

Reviewed By: krallin

Differential Revision: D40980308

fbshipit-source-id: 1f519cbc2c6d9553b33692e9e48f1664539647e6

Author: ndmitchell

starlark/src/codemap.rs

@@ -36,7 +36,7 @@ use gazebo::prelude::*;
 
 /// A small, `Copy`, value representing a position in a `CodeMap`'s file.
 #[derive(
-    Copy, Clone, Dupe, Hash, Eq, PartialEq, Ord, PartialOrd, Debug, Default
+    Copy, Clone, Dupe, Hash, Eq, PartialEq, PartialOrd, Ord, Debug, Default
 )]
 pub struct Pos(u32);
 

starlark/src/eval/bc/addr.rs

@@ -34,7 +34,7 @@ use crate::eval::bc::repr::BcInstrRepr;
 
 /// Address relative to bytecode start.
 #[derive(
-    Eq, PartialEq, Copy, Clone, Dupe, Debug, Ord, PartialOrd, Display, Hash, Default
+    Eq, PartialEq, Copy, Clone, Dupe, Debug, PartialOrd, Ord, Display, Hash, Default
 )]
 #[display(fmt = "@{}", _0)]
 pub(crate) struct BcAddr(pub(crate) u32);
@@ -204,7 +204,7 @@ impl<'b> BcPtrAddr<'b> {
 }
 
 /// Difference between addresses.
-#[derive(Eq, PartialEq, Copy, Clone, Dupe, Debug, Ord, PartialOrd, Display)]
+#[derive(Eq, PartialEq, Copy, Clone, Dupe, Debug, PartialOrd, Ord, Display)]
 #[display(fmt = "{}", _0)]
 pub(crate) struct BcAddrOffset(pub(crate) u32);
 

starlark/src/eval/bc/opcode.rs

@@ -28,7 +28,7 @@ use crate::eval::bc::instr_impl::*;
 
 /// Bytecode instruction opcode.
 #[starlark_internal_bc]
-#[derive(Debug, Copy, Clone, Dupe, Eq, PartialEq, Ord, PartialOrd, Hash)]
+#[derive(Debug, Copy, Clone, Dupe, Eq, PartialEq, PartialOrd, Ord, Hash)]
 #[repr(u32)]
 pub(crate) enum BcOpcode {
     Const,

starlark/src/eval/runtime/params.rs

@@ -59,7 +59,7 @@ pub(crate) enum ParameterKind<V> {
     KWargs,
 }
 
-#[derive(Debug, Copy, Clone, Dupe, PartialEq, Eq, Ord, PartialOrd)]
+#[derive(Debug, Copy, Clone, Dupe, PartialEq, Eq, PartialOrd, Ord)]
 enum CurrentParameterStyle {
     /// Parameter can be only filled positionally.
     PosOnly,

starlark/src/syntax/validate.rs

@@ -66,7 +66,7 @@ enum ValidateError {
     TypeAnnotationOnTupleAssign,
 }
 
-#[derive(Eq, PartialEq, Ord, PartialOrd)]
+#[derive(Eq, PartialEq, PartialOrd, Ord)]
 enum ArgsStage {
     Positional,
     Named,

starlark/src/values/types/string/mod.rs

@@ -64,7 +64,7 @@ pub(crate) mod simd;
 
 /// Index of a char in a string.
 /// This is different from string byte offset.
-#[derive(Eq, PartialEq, Ord, PartialOrd, Copy, Clone, Dupe, Debug)]
+#[derive(Eq, PartialEq, PartialOrd, Ord, Copy, Clone, Dupe, Debug)]
 pub(crate) struct CharIndex(pub(crate) usize);
 
 impl Sub for CharIndex {