Skip to content

Commit 29b1472

Browse files
committed
Fix merge conflicts
2 parents 89c2913 + 91ff665 commit 29b1472

File tree

167 files changed

+946
-6436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+946
-6436
lines changed

.openpublishing.redirection.json

Lines changed: 340 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43698,6 +43698,346 @@
4369843698
"redirect_url": "/training/modules/microsoft-defender-cloud-threat-protection/34-summary",
4369943699
"redirect_document_id": false
4370043700
},
43701+
{
43702+
"source_path": "learn-pr/paths/rust-first-steps/index.yml",
43703+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43704+
"redirect_document_id": false
43705+
},
43706+
{
43707+
"source_path": "learn-pr/language/rust-automated-tests/0-introduction.yml",
43708+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43709+
"redirect_document_id": false
43710+
},
43711+
{
43712+
"source_path": "learn-pr/language/rust-automated-tests/1-unit-tests.yml",
43713+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43714+
"redirect_document_id": false
43715+
},
43716+
{
43717+
"source_path": "learn-pr/language/rust-automated-tests/2-exercise-unit-tests.yml",
43718+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43719+
"redirect_document_id": false
43720+
},
43721+
{
43722+
"source_path": "learn-pr/language/rust-automated-tests/3-documentation-tests.yml",
43723+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43724+
"redirect_document_id": false
43725+
},
43726+
{
43727+
"source_path": "learn-pr/language/rust-automated-tests/4-exercise-documentation-tests.yml",
43728+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43729+
"redirect_document_id": false
43730+
},
43731+
{
43732+
"source_path": "learn-pr/language/rust-automated-tests/5-integration-tests.yml",
43733+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43734+
"redirect_document_id": false
43735+
},
43736+
{
43737+
"source_path": "learn-pr/language/rust-automated-tests/6-knowledge-check.yml",
43738+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43739+
"redirect_document_id": false
43740+
},
43741+
{
43742+
"source_path": "learn-pr/language/rust-automated-tests/7-summary.yml",
43743+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43744+
"redirect_document_id": false
43745+
},
43746+
{
43747+
"source_path": "learn-pr/language/rust-automated-tests/index.yml",
43748+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43749+
"redirect_document_id": false
43750+
},
43751+
{
43752+
"source_path": "learn-pr/language/rust-create-command-line-program/1-introduction.yml",
43753+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43754+
"redirect_document_id": false
43755+
},
43756+
{
43757+
"source_path": "learn-pr/language/rust-create-command-line-program/2-application-outline.yml",
43758+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43759+
"redirect_document_id": false
43760+
},
43761+
{
43762+
"source_path": "learn-pr/language/rust-create-command-line-program/3-cli-module.yml",
43763+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43764+
"redirect_document_id": false
43765+
},
43766+
{
43767+
"source_path": "learn-pr/language/rust-create-command-line-program/4-tasks-module.yml",
43768+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43769+
"redirect_document_id": false
43770+
},
43771+
{
43772+
"source_path": "learn-pr/language/rust-create-command-line-program/5-add-task-function.yml",
43773+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43774+
"redirect_document_id": false
43775+
},
43776+
{
43777+
"source_path": "learn-pr/language/rust-create-command-line-program/6-complete-task-function.yml",
43778+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43779+
"redirect_document_id": false
43780+
},
43781+
{
43782+
"source_path": "learn-pr/language/rust-create-command-line-program/7-list-tasks-function.yml",
43783+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43784+
"redirect_document_id": false
43785+
},
43786+
{
43787+
"source_path": "learn-pr/language/rust-create-command-line-program/8-main-module.yml",
43788+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43789+
"redirect_document_id": false
43790+
},
43791+
{
43792+
"source_path": "learn-pr/language/rust-create-command-line-program/9-use-default-journal.yml",
43793+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43794+
"redirect_document_id": false
43795+
},
43796+
{
43797+
"source_path": "learn-pr/language/rust-create-command-line-program/10-display-friendly-error-messages.yml",
43798+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43799+
"redirect_document_id": false
43800+
},
43801+
{
43802+
"source_path": "learn-pr/language/rust-create-command-line-program/11-knowledge-check.yml",
43803+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43804+
"redirect_document_id": false
43805+
},
43806+
{
43807+
"source_path": "learn-pr/language/rust-create-command-line-program/12-summary.yml",
43808+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43809+
"redirect_document_id": false
43810+
},
43811+
{
43812+
"source_path": "learn-pr/language/rust-create-command-line-program/index.yml",
43813+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43814+
"redirect_document_id": false
43815+
},
43816+
{
43817+
"source_path": "learn-pr/language/rust-create-program/0-introduction.yml",
43818+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43819+
"redirect_document_id": false
43820+
},
43821+
{
43822+
"source_path": "learn-pr/language/rust-create-program/1-program-structure.yml",
43823+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43824+
"redirect_document_id": false
43825+
},
43826+
{
43827+
"source_path": "learn-pr/language/rust-create-program/2-variables.yml",
43828+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43829+
"redirect_document_id": false
43830+
},
43831+
{
43832+
"source_path": "learn-pr/language/rust-create-program/3-basic-data-types.yml",
43833+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43834+
"redirect_document_id": false
43835+
},
43836+
{
43837+
"source_path": "learn-pr/language/rust-create-program/4-tuples-structs.yml",
43838+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43839+
"redirect_document_id": false
43840+
},
43841+
{
43842+
"source_path": "learn-pr/language/rust-create-program/5-enum-variants.yml",
43843+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43844+
"redirect_document_id": false
43845+
},
43846+
{
43847+
"source_path": "learn-pr/language/rust-create-program/6-functions.yml",
43848+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43849+
"redirect_document_id": false
43850+
},
43851+
{
43852+
"source_path": "learn-pr/language/rust-create-program/7-exercise.yml",
43853+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43854+
"redirect_document_id": false
43855+
},
43856+
{
43857+
"source_path": "learn-pr/language/rust-create-program/8-summary.yml",
43858+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43859+
"redirect_document_id": false
43860+
},
43861+
{
43862+
"source_path": "learn-pr/language/rust-create-program/index.yml",
43863+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43864+
"redirect_document_id": false
43865+
},
43866+
{
43867+
"source_path": "learn-pr/language/rust-error-handling/1-introduction.yml",
43868+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43869+
"redirect_document_id": false
43870+
},
43871+
{
43872+
"source_path": "learn-pr/language/rust-error-handling/2-fatal-errors-with-panic.yml",
43873+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43874+
"redirect_document_id": false
43875+
},
43876+
{
43877+
"source_path": "learn-pr/language/rust-error-handling/3-use-option-type-deal-with-absence.yml",
43878+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43879+
"redirect_document_id": false
43880+
},
43881+
{
43882+
"source_path": "learn-pr/language/rust-error-handling/4-exercise-use-option-type.yml",
43883+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43884+
"redirect_document_id": false
43885+
},
43886+
{
43887+
"source_path": "learn-pr/language/rust-error-handling/5-use-result-type.yml",
43888+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43889+
"redirect_document_id": false
43890+
},
43891+
{
43892+
"source_path": "learn-pr/language/rust-error-handling/6-exercise-use-result-type.yml",
43893+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43894+
"redirect_document_id": false
43895+
},
43896+
{
43897+
"source_path": "learn-pr/language/rust-error-handling/7-check.yml",
43898+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43899+
"redirect_document_id": false
43900+
},
43901+
{
43902+
"source_path": "learn-pr/language/rust-error-handling/8-summary.yml",
43903+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43904+
"redirect_document_id": false
43905+
},
43906+
{
43907+
"source_path": "learn-pr/language/rust-error-handling/index.yml",
43908+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43909+
"redirect_document_id": false
43910+
},
43911+
{
43912+
"source_path": "learn-pr/language/rust-generic-types-traits/0-introduction.yml",
43913+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43914+
"redirect_document_id": false
43915+
},
43916+
{
43917+
"source_path": "learn-pr/language/rust-generic-types-traits/1-what-are-generic-data-types.yml",
43918+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43919+
"redirect_document_id": false
43920+
},
43921+
{
43922+
"source_path": "learn-pr/language/rust-generic-types-traits/2-define-shared-behavior-with-traits.yml",
43923+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43924+
"redirect_document_id": false
43925+
},
43926+
{
43927+
"source_path": "learn-pr/language/rust-generic-types-traits/3-derive.yml",
43928+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43929+
"redirect_document_id": false
43930+
},
43931+
{
43932+
"source_path": "learn-pr/language/rust-generic-types-traits/4-trait-bounds.yml",
43933+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43934+
"redirect_document_id": false
43935+
},
43936+
{
43937+
"source_path": "learn-pr/language/rust-generic-types-traits/5-iterators.yml",
43938+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43939+
"redirect_document_id": false
43940+
},
43941+
{
43942+
"source_path": "learn-pr/language/rust-generic-types-traits/6-exercise-implement-generic-type.yml",
43943+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43944+
"redirect_document_id": false
43945+
},
43946+
{
43947+
"source_path": "learn-pr/language/rust-generic-types-traits/7-exercise-implement-iterator.yml",
43948+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43949+
"redirect_document_id": false
43950+
},
43951+
{
43952+
"source_path": "learn-pr/language/rust-generic-types-traits/8-knowledge-check.yml",
43953+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43954+
"redirect_document_id": false
43955+
},
43956+
{
43957+
"source_path": "learn-pr/language/rust-generic-types-traits/9-summary.yml",
43958+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43959+
"redirect_document_id": false
43960+
},
43961+
{
43962+
"source_path": "learn-pr/language/rust-generic-types-traits/index.yml",
43963+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43964+
"redirect_document_id": false
43965+
},
43966+
{
43967+
"source_path": "learn-pr/language/rust-if-else-expressions/0-introduction.yml",
43968+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43969+
"redirect_document_id": false
43970+
},
43971+
{
43972+
"source_path": "learn-pr/language/rust-if-else-expressions/1-arrays.yml",
43973+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43974+
"redirect_document_id": false
43975+
},
43976+
{
43977+
"source_path": "learn-pr/language/rust-if-else-expressions/2-vectors.yml",
43978+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43979+
"redirect_document_id": false
43980+
},
43981+
{
43982+
"source_path": "learn-pr/language/rust-if-else-expressions/3-exercise-data-types.yml",
43983+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43984+
"redirect_document_id": false
43985+
},
43986+
{
43987+
"source_path": "learn-pr/language/rust-if-else-expressions/4-if-else-expressions.yml",
43988+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43989+
"redirect_document_id": false
43990+
},
43991+
{
43992+
"source_path": "learn-pr/language/rust-if-else-expressions/5-exercise-if-else.yml",
43993+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43994+
"redirect_document_id": false
43995+
},
43996+
{
43997+
"source_path": "learn-pr/language/rust-if-else-expressions/6-summary.yml",
43998+
"redirect_url": "https://learn.microsoft.com/training/browse/",
43999+
"redirect_document_id": false
44000+
},
44001+
{
44002+
"source_path": "learn-pr/language/rust-if-else-expressions/index.yml",
44003+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44004+
"redirect_document_id": false
44005+
},
44006+
{
44007+
"source_path": "learn-pr/language/rust-introduction/1-introduction.yml",
44008+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44009+
"redirect_document_id": false
44010+
},
44011+
{
44012+
"source_path": "learn-pr/language/rust-introduction/2-rust-overview.yml",
44013+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44014+
"redirect_document_id": false
44015+
},
44016+
{
44017+
"source_path": "learn-pr/language/rust-introduction/3-rust-features.yml",
44018+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44019+
"redirect_document_id": false
44020+
},
44021+
{
44022+
"source_path": "learn-pr/language/rust-introduction/4-rust-playground.yml",
44023+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44024+
"redirect_document_id": false
44025+
},
44026+
{
44027+
"source_path": "learn-pr/language/rust-introduction/5-summary.yml",
44028+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44029+
"redirect_document_id": false
44030+
},
44031+
{
44032+
"source_path": "learn-pr/language/rust-introduction/exercise.yml",
44033+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44034+
"redirect_document_id": false
44035+
},
44036+
{
44037+
"source_path": "learn-pr/language/rust-introduction/index.yml",
44038+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44039+
"redirect_document_id": false
44040+
},
4370144041
{
4370244042
"source_path": "learn-pr/language/rust-loop-expressions/0-introduction.yml",
4370344043
"redirect_url": "https://learn.microsoft.com/training/browse/",

learn-pr/achievements.yml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5269,4 +5269,44 @@ achievements:
52695269
type: badge
52705270
title: Use loops to iterate through data in Rust
52715271
summary: Explore how to use hash maps in Rust. Discover how to use loop expressions to iterate through data.
5272-
iconUrl: /training/achievements/rust-understand-common-concepts.svg
5272+
iconUrl: /training/achievements/rust-understand-common-concepts.svg
5273+
- uid: learn.language.rust-introduction.badge
5274+
type: badge
5275+
title: What is Rust
5276+
summary: A quick introduction to Rust language features and how Rust compares with other programming languages.
5277+
iconUrl: /training/achievements/rust-get-started.svg
5278+
- uid: learn.language.rust-if-else-expressions.badge
5279+
type: badge
5280+
title: Test conditions with if/else expressions in Rust
5281+
summary: Explore Rust compound data types like arrays and vectors. Discover how to use if/else statements to test conditions.
5282+
iconUrl: /training/achievements/rust-understand-common-concepts.svg
5283+
- uid: learn.language.rust-generic-types-traits.badge
5284+
type: badge
5285+
title: Implement generic types and traits
5286+
summary: Understand what generic types and traits are and how to use them in Rust.
5287+
iconUrl: /training/achievements/rust-generic-types-traits.svg
5288+
- uid: learn.language.rust-error-handling.badge
5289+
type: badge
5290+
title: Handle errors in Rust
5291+
summary: UIn this module, you'll learn about ways to handle errors in Rust.
5292+
iconUrl: /training/achievements/rust-error-handling.svg
5293+
- uid: learn.language.rust-create-command-line-program.badge
5294+
type: badge
5295+
title: Build a command-line to-do list program
5296+
summary: Create a command-line program to manage to-do list items.
5297+
iconUrl: /training/achievements/rust-create-command-line-program.svg
5298+
- uid: learn.language.rust-create-program.badge
5299+
type: badge
5300+
title: Create your first Rust program
5301+
summary: Learn about Rust concepts, including variables, data types, and functions.
5302+
iconUrl: /training/achievements/rust-understand-common-concepts.svg
5303+
- uid: learn.languages.rust-first-steps.trophy
5304+
type: trophy
5305+
title: Take your first steps with Rust
5306+
summary: Interested in learning a new programming language that's growing in use and popularity? Start here! Lay the foundation of knowledge you need to build fast and effective programs in Rust.
5307+
iconUrl: /training/achievements/take-your-first-steps-with-rust.svg
5308+
- uid: learn.language.rust-automated-tests.badge
5309+
type: badge
5310+
title: Write automated tests
5311+
summary: Learn about the types of testing you can do with Rust.
5312+
iconUrl: /training/achievements/rust-automated-tests.svg

0 commit comments

Comments
 (0)