Bump rust to 1.47.0

account-decoder/Cargo.toml

@@ -22,7 +22,7 @@ solana-config-program = { path = "../programs/config", version = "1.5.0" }
 solana-sdk = { path = "../sdk", version = "1.5.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.5.0" }
 solana-vote-program = { path = "../programs/vote", version = "1.5.0" }
-spl-token-v2-0 = { package = "spl-token", version = "=2.0.6", features = ["skip-no-mangle"] }
+spl-token-v2-0 = { path = "../../solana-program-library/token/program", package = "spl-token", version = "=2.0.7" }
 thiserror = "1.0"
 
 [package.metadata.docs.rs]

account-decoder/src/parse_account_data.rs

@@ -81,7 +81,7 @@ pub fn parse_account_data(
 ) -> Result<ParsedAccount, ParseAccountError> {
     let program_name = PARSABLE_PROGRAM_IDS
         .get(program_id)
-        .ok_or_else(|| ParseAccountError::ProgramNotParsable)?;
+        .ok_or(ParseAccountError::ProgramNotParsable)?;
     let additional_data = additional_data.unwrap_or_default();
     let parsed_json = match program_name {
         ParsableAccount::Config => serde_json::to_value(parse_config(data, pubkey)?)?,

ci/docker-run.sh

@@ -47,7 +47,12 @@ if [[ -n $CI ]]; then
 else
   # Avoid sharing ~/.cargo when building locally to avoid a mixed macOS/Linux
   # ~/.cargo
-  ARGS+=(--volume "$PWD:/home")
+  ARGS+=(
+    --volume "$PWD:/home"
+    --volume "/home/trent/code/solana/solana-2:/solana-2"
+    --volume "/home/trent/code/solana/solana-program-library:/solana-program-library"
+  )
+
 fi
 ARGS+=(--env "HOME=/home" --env "CARGO_HOME=/home/.cargo")
 

ci/docker-rust-nightly/Dockerfile

@@ -1,4 +1,4 @@
-FROM solanalabs/rust:1.46.0
+FROM solanalabs/rust:1.47.0
 ARG date
 
 RUN set -x \

ci/docker-rust/Dockerfile

@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.46.0
+FROM rust:1.47.0
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

ci/rust-version.sh

@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.46.0
+  stable_version=1.47.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-08-17
+  nightly_version=2020-10-08
 fi
 
 

ci/test-checks.sh

@@ -54,8 +54,7 @@ _ cargo +"$rust_stable" fmt --all -- --check
 # -Z... is needed because of clippy bug: https://github.com/rust-lang/rust-clippy/issues/4612
 # run nightly clippy for `sdk/` as there's a moderate amount of nightly-only code there
 _ cargo +"$rust_nightly" clippy \
-  -Zunstable-options --workspace --all-targets \
-  -- --deny=warnings --allow=clippy::stable_sort_primitive
+  -Zunstable-options --workspace --all-targets -- --deny=warnings
 
 cargo_audit_ignores=(
   # failure is officially deprecated/unmaintained

core/benches/cluster_info.rs

@@ -38,7 +38,7 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
     let stakes = Arc::new(stakes);
     let cluster_info = Arc::new(cluster_info);
     let (peers, peers_and_stakes) = get_broadcast_peers(&cluster_info, Some(stakes));
-    let shreds = Arc::new(shreds);
+    let shreds: Arc<[Shred]> = shreds.into();
     let last_datapoint = Arc::new(AtomicU64::new(0));
     bencher.iter(move || {
         let shreds = shreds.clone();

core/benches/retransmit_stage.rs

@@ -56,7 +56,7 @@ fn bench_retransmitter(bencher: &mut Bencher) {
     let (packet_sender, packet_receiver) = channel();
     let packet_receiver = Arc::new(Mutex::new(packet_receiver));
     const NUM_THREADS: usize = 2;
-    let sockets = (0..NUM_THREADS)
+    let sockets: Vec<_> = (0..NUM_THREADS)
         .map(|_| UdpSocket::bind("0.0.0.0:0").unwrap())
         .collect();
 
@@ -73,7 +73,7 @@ fn bench_retransmitter(bencher: &mut Bencher) {
     info!("batches: {}", batches.len());
 
     let retransmitter_handles = retransmitter(
-        Arc::new(sockets),
+        sockets.into(),
         bank_forks,
         &leader_schedule_cache,
         cluster_info,

core/src/banking_stage.rs

@@ -1961,7 +1961,7 @@ mod tests {
 
             assert_eq!(processed_transactions_count, 0,);
 
-            retryable_txs.sort();
+            retryable_txs.sort_unstable();
             let expected: Vec<usize> = (0..transactions.len()).collect();
             assert_eq!(retryable_txs, expected);
         }

core/src/broadcast_stage.rs

@@ -43,7 +43,7 @@ mod standard_broadcast_run;
 pub(crate) const NUM_INSERT_THREADS: usize = 2;
 pub(crate) type RetransmitSlotsSender = CrossbeamSender<HashMap<Slot, Arc<Bank>>>;
 pub(crate) type RetransmitSlotsReceiver = CrossbeamReceiver<HashMap<Slot, Arc<Bank>>>;
-pub(crate) type RecordReceiver = Receiver<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>;
+pub(crate) type RecordReceiver = Receiver<(Arc<[Shred]>, Option<BroadcastShredBatchInfo>)>;
 pub(crate) type TransmitReceiver = Receiver<(TransmitShreds, Option<BroadcastShredBatchInfo>)>;
 
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -104,14 +104,14 @@ impl BroadcastStageType {
     }
 }
 
-pub type TransmitShreds = (Option<Arc<HashMap<Pubkey, u64>>>, Arc<Vec<Shred>>);
+pub type TransmitShreds = (Option<Arc<HashMap<Pubkey, u64>>>, Arc<[Shred]>);
 trait BroadcastRun {
     fn run(
         &mut self,
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
         socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        blockstore_sender: &Sender<(Arc<[Shred]>, Option<BroadcastShredBatchInfo>)>,
     ) -> Result<()>;
     fn transmit(
         &mut self,
@@ -154,7 +154,7 @@ impl BroadcastStage {
         blockstore: &Arc<Blockstore>,
         receiver: &Receiver<WorkingBankEntry>,
         socket_sender: &Sender<(TransmitShreds, Option<BroadcastShredBatchInfo>)>,
-        blockstore_sender: &Sender<(Arc<Vec<Shred>>, Option<BroadcastShredBatchInfo>)>,
+        blockstore_sender: &Sender<(Arc<[Shred]>, Option<BroadcastShredBatchInfo>)>,
         mut broadcast_stage_run: impl BroadcastRun,
     ) -> BroadcastStageReturnType {
         loop {
@@ -307,21 +307,19 @@ impl BroadcastStage {
             let bank_epoch = bank.get_leader_schedule_epoch(bank.slot());
             let stakes = staking_utils::staked_nodes_at_epoch(&bank, bank_epoch);
             let stakes = stakes.map(Arc::new);
-            let data_shreds = Arc::new(
-                blockstore
-                    .get_data_shreds_for_slot(bank.slot(), 0)
-                    .expect("My own shreds must be reconstructable"),
-            );
+            let data_shreds: Arc<[Shred]> = blockstore
+                .get_data_shreds_for_slot(bank.slot(), 0)
+                .expect("My own shreds must be reconstructable")
+                .into();
 
             if !data_shreds.is_empty() {
                 socket_sender.send(((stakes.clone(), data_shreds), None))?;
             }
 
-            let coding_shreds = Arc::new(
-                blockstore
-                    .get_coding_shreds_for_slot(bank.slot(), 0)
-                    .expect("My own shreds must be reconstructable"),
-            );
+            let coding_shreds: Arc<[Shred]> = blockstore
+                .get_coding_shreds_for_slot(bank.slot(), 0)
+                .expect("My own shreds must be reconstructable")
+                .into();
 
             if !coding_shreds.is_empty() {
                 socket_sender.send(((stakes.clone(), coding_shreds), None))?;
@@ -371,7 +369,7 @@ pub fn get_broadcast_peers<S: std::hash::BuildHasher>(
 /// # Remarks
 pub fn broadcast_shreds(
     s: &UdpSocket,
-    shreds: &Arc<Vec<Shred>>,
+    shreds: &Arc<[Shred]>,
     peers_and_stakes: &[(u64, usize)],
     peers: &[ContactInfo],
     last_datapoint_submit: &Arc<AtomicU64>,
@@ -480,11 +478,11 @@ pub mod test {
             coding_shreds.clone(),
             data_shreds
                 .into_iter()
-                .map(|s| (stakes.clone(), Arc::new(vec![s])))
+                .map(|s| (stakes.clone(), vec![s].into()))
                 .collect(),
             coding_shreds
                 .into_iter()
-                .map(|s| (stakes.clone(), Arc::new(vec![s])))
+                .map(|s| (stakes.clone(), vec![s].into()))
                 .collect(),
         )
     }