Merge remote-tracking branch 'origin/master' into mr/530-rust-essentials-no-you-in-content

Author: frank-at-adacore

courses/ada_essentials/190_exceptions/02-handlers.rst

@@ -197,53 +197,45 @@ Exception Handler Content
 Quiz
 ------
 
-.. container:: latex_environment scriptsize
-
- .. container:: columns
-
-  .. container:: column
-
-    .. code:: Ada
-     :number-lines: 1
-
-       procedure Main is
-          A, B, C, D : Integer range 0 .. 100;
-       begin
-          A := 1; B := 2; C := 3; D := 4;
-          begin
-             D := A - C + B;
-          exception
-             when others => Put_Line ("One");
-                            D := 1;
-          end;
-          D := D + 1;
-          begin
-             D := D / (A - C + B);
-          exception
-             when others => Put_Line ("Two");
-                            D := -1;
-          end;
-       exception
-          when others =>
-             Put_Line ("Three");
-       end Main;
-
-  .. container:: column
+.. code:: Ada
+  :number-lines: 1
+  :font-size: footnotesize
 
-   What will get printed?
+    procedure Main is
+      A, B, C, D : Integer range 0 .. 100;
+    begin
+      A := 1; B := 2; C := 3; D := 4;
+      begin
+        D := A - C + B;
+      exception
+        when others => Put_Line ("One");
+                       D := 1;
+      end;
+      D := D + 1;
+      begin
+        D := D / (A - C + B);
+      exception
+        when others => Put_Line ("Two");
+                       D := -1;
+      end;
+    exception
+      when others =>
+        Put_Line ("Three");
+      end Main;
 
-      A. One, Two, Three
-      B. :answer:`Two, Three`
-      C. Two
-      D. Three
+What will get printed?
 
-   .. container:: animate
+  A. One, Two, Three
+  B. :answer:`Two, Three`
+  C. Two
+  D. Three
 
-      Explanations
+.. container:: animate
 
-      A. :ada:`One` is never printed, as although :ada:`(A - C)` is not in the range of :ada:`0 .. 100`, this is only checked on assignment (so after the addition of :ada:`B`).
-      B. Line 6 does not raise an exception, (so ``One`` is not printed), but Line 2 does - causing ``Two`` to be printed.
-         But Line 16 also raises an exception, causing ``Three`` to be printed
-      C. If we reach :ada:`Two`, the assignment on line 16 will cause :ada:`Three` to be reached
-      D. Divide by 0 on line 13 causes an exception, so :ada:`Two` must be called
+  Explanations
 
+  A. :ada:`One` is never printed. Although :ada:`(A - C)` is not in range, this is only checked on assignment (after addition of :ada:`B`).
+  B. No exception on Line 6 (``One`` is not printed), but Line 2 does - so ``Two`` to be printed.
+     Line 16 also raises an exception, so ``Three`` to be printed.
+  C. If we reach :ada:`Two`, line 16 will cause :ada:`Three` to be reached
+  D. Divide by 0 on line 13 causes an exception, so :ada:`Two` must be called

courses/ada_essentials/190_exceptions/06-propagation.rst

@@ -36,6 +36,7 @@ Propagation Demo
 
    .. code:: Ada
      :number-lines: 1
+     :font-size: small
 
       procedure Do_Something is
         Error : exception;
@@ -56,6 +57,7 @@ Propagation Demo
 
    .. code:: Ada
      :number-lines: 16
+     :font-size: small
 
       begin -- Do_Something
         Maybe_Raise (3);

courses/ada_essentials/230_interfacing_with_c/02-import__export.rst

@@ -11,7 +11,7 @@ Import / Export Aspects (1/2)
    * :ada:`Import` indicates a subprogram imported into Ada
    * :ada:`Export` indicates a subprogram exported from Ada
 
-* Need aspects definining calling convention and external name
+* Need aspects defining calling convention and external name
 
   * :ada:`Convention => C` tells linker to use C-style calling convention
   * :ada:`External_Name => "<name>"` defines object name for linker

courses/ada_essentials/273_subprogram_contracts/02-preconditions_and_postconditions.rst

@@ -201,8 +201,7 @@ Preventing Exceptions with ... Exceptions?
 
        function Area (Length : Positive;
                       Height : Positive)
-                      return Positive is
-          (Length * Height)
+                      return Positive
        with Pre => Length * Height <= Positive'Last;
 
 * But what happens when we verify the precondition?
@@ -215,8 +214,8 @@ Preventing Exceptions with ... Exceptions?
 
       function Area (Length : Positive;
                      Height : Positive)
-                     return Positive is
-      with Pre => Positive'Last / Height <= Length;
+                     return Positive
+      with Pre => Length <= Positive'Last / Height;
 
 ------
 Quiz

courses/rust_essentials/015_overview.rst

@@ -37,5 +37,5 @@ Overview
 .. container:: PRELUDE END
 
 .. include:: 015_overview/01_what_is_rust.rst
-.. include:: 015_overview/02_benefits.rst
+.. include:: 015_overview/02_benefits_of_rust.rst
 .. include:: 015_overview/03_tooling.rst    

courses/rust_essentials/015_overview/01_what_is_rust.rst

@@ -6,7 +6,7 @@ What Is Rust?
 What Is Rust?
 ---------------
 
-- Rust is a new(er) programming language
+- New(er) programming language
 
    - First stable release in 2015 (1.0)
    - Modern design to solve older language problems
@@ -15,7 +15,7 @@ What Is Rust?
 
    - :toolname:`rustc` uses LLVM as its backend
 
--  Rust supports many platforms and architectures
+-  Supports many platforms and architectures
 
    -  Linux, Windows, VxWorks...
    -  x86, ARM ...   
@@ -24,7 +24,7 @@ What Is Rust?
 What Kind of Language Is Rust?
 --------------------------------
 
-**Rust fits in the same area as other systems languages (Ada, C++, ...)**
+**Fits in the same area as other systems languages (Ada, C++, ...)**
 
 -  High flexibility
 -  High level of control

…_essentials/015_overview/02_benefits.rst …als/015_overview/02_benefits_of_rust.rstcourses/rust_essentials/015_overview/02_benefits.rst renamed to courses/rust_essentials/015_overview/02_benefits_of_rust.rst courses/rust_essentials/015_overview/02_benefits.rst renamed to courses/rust_essentials/015_overview/02_benefits_of_rust.rst

@@ -20,7 +20,7 @@ Compile Time Memory Safety
 No Undefined Runtime Behavior
 -------------------------------
 
-**What a Rust statement does is never left unspecified**
+**What a statement does is never left unspecified**
 
    -  Array access is bounds checked
    -  Integer overflow is defined (panic or wrap-around)

courses/rust_essentials/015_overview/03_tooling.rst

@@ -15,17 +15,17 @@ GNAT Pro for Rust
 
 - AdaCore's Rust Development Toolsuite
 
-  - :toolname:`cargo` - Rust package manager
-  - :toolname:`rustc` - Rust compiler
-  - :toolname:`gdb` - Rust-aware debugger
-  - :toolname:`rust-analyzer` - Rust language server/IDE integration tool
-  - :toolname:`clippy` - Rust linter
-  - :toolname:`rustfmt` - Rust code formatter
+  - :toolname:`cargo` - package manager
+  - :toolname:`rustc` - compiler
+  - :toolname:`gdb` - debugger
+  - :toolname:`rust-analyzer` - language server/IDE integration tool
+  - :toolname:`clippy` - linter
+  - :toolname:`rustfmt` - code formatter
   - :toolname:`gprbuild` - AdaCore’s multi-language build tool
 
 - Tooling pairs seamlessly with :toolname:`VS Code`
 
 .. note::
 
   The :url:`Rust Playground <https://play.rust-lang.org/>` provides an easy
-  way to run short Rust programs, quickly!
+  way to run short programs, quickly!

courses/rust_essentials/020_hello_world/01_hello_world.rst

@@ -49,3 +49,16 @@ Hello World
 .. container:: animate 6-
 
   * :rust:`println!` - macro for printing a string followed by newline
+
+-------------------------
+File Naming Conventions
+-------------------------
+
+* File extension is :filename:`.rs`
+* File name is the module name in :dfn:`snake case`
+
+    * All lower case, spaces replaced with underscore
+
+.. note::
+
+  :rust:`fn main()` will be in file :filename:`main.rs`

courses/rust_essentials/030_types_and_values/00_introduction.rst

@@ -20,4 +20,4 @@ Topics Covered
 
 - **Type Inference** 
 
-    - How Rust is smart enough to often guess the type of data
+    - How the compiler is smart enough to often guess the type of data